diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 87093b7156..cf329910d8 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -27,11 +27,11 @@ const val kotlinVersion = "1.3.50" object ProjectVersions { const val launcherVersion = "2.0.4" - const val rlVersion = "1.5.43-SNAPSHOT" + const val rlVersion = "1.5.44-SNAPSHOT" - const val openosrsVersion = "2.1.17.0-SNAPSHOT" + const val openosrsVersion = "2.1.18-SNAPSHOT" - const val rsversion = 186 + const val rsversion = 187 const val cacheversion = 165 } diff --git a/runescape-client/src/main/java/AbstractArchive.java b/runescape-client/src/main/java/AbstractArchive.java index 83f06b627a..4ca50dc63c 100644 --- a/runescape-client/src/main/java/AbstractArchive.java +++ b/runescape-client/src/main/java/AbstractArchive.java @@ -3,82 +3,83 @@ 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("hf") +@ObfuscatedName("hz") @Implements("AbstractArchive") public abstract class AbstractArchive { - @ObfuscatedName("e") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Llk;" + signature = "Llw;" ) @Export("gzipDecompressor") static GZipDecompressor gzipDecompressor; - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1872832013 + intValue = 433676401 ) - static int field3152; - @ObfuscatedName("f") + static int field3118; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 2020242851 + intValue = 1190752161 ) @Export("groupCount") int groupCount; - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("groupIds") int[] groupIds; - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("groupNameHashes") int[] groupNameHashes; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lla;" + signature = "Llq;" ) @Export("groupNameHashTable") IntHashTable groupNameHashTable; - @ObfuscatedName("p") + @ObfuscatedName("b") @Export("groupCrcs") int[] groupCrcs; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("groupVersions") int[] groupVersions; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("fileCounts") int[] fileCounts; - @ObfuscatedName("w") + @ObfuscatedName("a") @Export("fileIds") int[][] fileIds; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("fileNameHashes") int[][] fileNameHashes; - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "[Lla;" + signature = "[Llq;" ) @Export("fileNameHashTables") IntHashTable[] fileNameHashTables; - @ObfuscatedName("x") + @ObfuscatedName("o") @Export("groups") Object[] groups; - @ObfuscatedName("o") + @ObfuscatedName("v") @Export("files") Object[][] files; - @ObfuscatedName("n") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 765464633 + intValue = -1303272215 ) @Export("hash") public int hash; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("releaseGroups") boolean releaseGroups; - @ObfuscatedName("c") + @ObfuscatedName("t") @Export("shallowFiles") boolean shallowFiles; static { gzipDecompressor = new GZipDecompressor(); - field3152 = 0; + field3118 = 0; } AbstractArchive(boolean var1, boolean var2) { @@ -86,131 +87,133 @@ public abstract class AbstractArchive { this.shallowFiles = var2; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "([BI)V", - garbageValue = "-764987026" + garbageValue = "105045873" ) @Export("decodeIndex") void decodeIndex(byte[] var1) { - this.hash = class222.method4196(var1, var1.length); - Buffer var2 = new Buffer(class226.decompressBytes(var1)); - int var3 = var2.readUnsignedByte(); - if (var3 >= 5 && var3 <= 7) { - if (var3 >= 6) { - var2.readInt(); + int var3 = var1.length; + int var2 = Timer.method5033(var1, 0, var3); + this.hash = var2; + Buffer var4 = new Buffer(Skills.decompressBytes(var1)); + int var5 = var4.readUnsignedByte(); + if (var5 >= 5 && var5 <= 7) { + if (var5 >= 6) { + var4.readInt(); } - int var4 = var2.readUnsignedByte(); - if (var3 >= 7) { - this.groupCount = var2.method5617(); + int var6 = var4.readUnsignedByte(); + if (var5 >= 7) { + this.groupCount = var4.method5559(); } else { - this.groupCount = var2.readUnsignedShort(); + this.groupCount = var4.readUnsignedShort(); } - int var5 = 0; - int var6 = -1; + int var7 = 0; + int var8 = -1; this.groupIds = new int[this.groupCount]; - int var7; - if (var3 >= 7) { - for (var7 = 0; var7 < this.groupCount; ++var7) { - this.groupIds[var7] = var5 += var2.method5617(); - if (this.groupIds[var7] > var6) { - var6 = this.groupIds[var7]; + int var9; + if (var5 >= 7) { + for (var9 = 0; var9 < this.groupCount; ++var9) { + this.groupIds[var9] = var7 += var4.method5559(); + if (this.groupIds[var9] > var8) { + var8 = this.groupIds[var9]; } } } else { - for (var7 = 0; var7 < this.groupCount; ++var7) { - this.groupIds[var7] = var5 += var2.readUnsignedShort(); - if (this.groupIds[var7] > var6) { - var6 = this.groupIds[var7]; + 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[var6 + 1]; - this.groupVersions = new int[var6 + 1]; - this.fileCounts = new int[var6 + 1]; - this.fileIds = new int[var6 + 1][]; - this.groups = new Object[var6 + 1]; - this.files = new Object[var6 + 1][]; - if (var4 != 0) { - this.groupNameHashes = new int[var6 + 1]; + 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 (var7 = 0; var7 < this.groupCount; ++var7) { - this.groupNameHashes[this.groupIds[var7]] = var2.readInt(); + for (var9 = 0; var9 < this.groupCount; ++var9) { + this.groupNameHashes[this.groupIds[var9]] = var4.readInt(); } this.groupNameHashTable = new IntHashTable(this.groupNameHashes); } - for (var7 = 0; var7 < this.groupCount; ++var7) { - this.groupCrcs[this.groupIds[var7]] = var2.readInt(); + for (var9 = 0; var9 < this.groupCount; ++var9) { + this.groupCrcs[this.groupIds[var9]] = var4.readInt(); } - for (var7 = 0; var7 < this.groupCount; ++var7) { - this.groupVersions[this.groupIds[var7]] = var2.readInt(); + for (var9 = 0; var9 < this.groupCount; ++var9) { + this.groupVersions[this.groupIds[var9]] = var4.readInt(); } - for (var7 = 0; var7 < this.groupCount; ++var7) { - this.fileCounts[this.groupIds[var7]] = var2.readUnsignedShort(); + for (var9 = 0; var9 < this.groupCount; ++var9) { + this.fileCounts[this.groupIds[var9]] = var4.readUnsignedShort(); } - int var8; - int var9; int var10; int var11; int var12; - if (var3 >= 7) { - for (var7 = 0; var7 < this.groupCount; ++var7) { - var8 = this.groupIds[var7]; - var9 = this.fileCounts[var8]; - var5 = 0; - var10 = -1; - this.fileIds[var8] = new int[var9]; + 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 (var11 = 0; var11 < var9; ++var11) { - var12 = this.fileIds[var8][var11] = var5 += var2.method5617(); - if (var12 > var10) { - var10 = var12; + for (var13 = 0; var13 < var11; ++var13) { + var14 = this.fileIds[var10][var13] = var7 += var4.method5559(); + if (var14 > var12) { + var12 = var14; } } - this.files[var8] = new Object[var10 + 1]; + this.files[var10] = new Object[var12 + 1]; } } else { - for (var7 = 0; var7 < this.groupCount; ++var7) { - var8 = this.groupIds[var7]; - var9 = this.fileCounts[var8]; - var5 = 0; - var10 = -1; - this.fileIds[var8] = new int[var9]; + for (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 (var11 = 0; var11 < var9; ++var11) { - var12 = this.fileIds[var8][var11] = var5 += var2.readUnsignedShort(); - if (var12 > var10) { - var10 = var12; + for (var13 = 0; var13 < var11; ++var13) { + var14 = this.fileIds[var10][var13] = var7 += var4.readUnsignedShort(); + if (var14 > var12) { + var12 = var14; } } - this.files[var8] = new Object[var10 + 1]; + this.files[var10] = new Object[var12 + 1]; } } - if (var4 != 0) { - this.fileNameHashes = new int[var6 + 1][]; - this.fileNameHashTables = new IntHashTable[var6 + 1]; + if (var6 != 0) { + this.fileNameHashes = new int[var8 + 1][]; + this.fileNameHashTables = new IntHashTable[var8 + 1]; - for (var7 = 0; var7 < this.groupCount; ++var7) { - var8 = this.groupIds[var7]; - var9 = this.fileCounts[var8]; - this.fileNameHashes[var8] = new int[this.files[var8].length]; + for (var9 = 0; var9 < this.groupCount; ++var9) { + var10 = this.groupIds[var9]; + var11 = this.fileCounts[var10]; + this.fileNameHashes[var10] = new int[this.files[var10].length]; - for (var10 = 0; var10 < var9; ++var10) { - this.fileNameHashes[var8][this.fileIds[var8][var10]] = var2.readInt(); + for (var12 = 0; var12 < var11; ++var12) { + this.fileNameHashes[var10][this.fileIds[var10][var12]] = var4.readInt(); } - this.fileNameHashTables[var8] = new IntHashTable(this.fileNameHashes[var8]); + this.fileNameHashTables[var10] = new IntHashTable(this.fileNameHashes[var10]); } } @@ -219,29 +222,29 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-64779180" + garbageValue = "236985177" ) @Export("loadRegionFromGroup") void loadRegionFromGroup(int var1) { } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(IIB)[B", - garbageValue = "40" + signature = "(III)[B", + garbageValue = "-429733349" ) @Export("takeFile") public byte[] takeFile(int var1, int var2) { return this.takeFileEncrypted(var1, var2, (int[])null); } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(II[II)[B", - garbageValue = "1072052433" + signature = "(II[IB)[B", + garbageValue = "1" ) @Export("takeFileEncrypted") public byte[] takeFileEncrypted(int var1, int var2, int[] var3) { @@ -257,21 +260,36 @@ public abstract class AbstractArchive { } } - byte[] var5 = FontName.serialize(this.files[var1][var2], false); + Object var5 = this.files[var1][var2]; + byte[] var7; + if (var5 == null) { + var7 = null; + } else if (var5 instanceof byte[]) { + byte[] var6 = (byte[])((byte[])var5); + var7 = var6; + } else { + if (!(var5 instanceof AbstractByteArrayCopier)) { + throw new IllegalArgumentException(); + } + + AbstractByteArrayCopier var8 = (AbstractByteArrayCopier)var5; + var7 = var8.get(); + } + if (this.shallowFiles) { this.files[var1][var2] = null; } - return var5; + return var7; } else { return null; } } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(III)Z", - garbageValue = "398293520" + signature = "(IIB)Z", + garbageValue = "25" ) @Export("tryLoadFile") public boolean tryLoadFile(int var1, int var2) { @@ -289,12 +307,12 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "1197413241" + signature = "(IB)Z", + garbageValue = "120" ) - public boolean method4237(int var1) { + public boolean method4157(int var1) { if (this.files.length == 1) { return this.tryLoadFile(0, var1); } else if (this.files[var1].length == 1) { @@ -304,10 +322,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(IB)Z", - garbageValue = "-18" + garbageValue = "5" ) @Export("tryLoadGroup") public boolean tryLoadGroup(int var1) { @@ -319,10 +337,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "2065138049" + garbageValue = "-1599628318" ) @Export("isFullyLoaded") public boolean isFullyLoaded() { @@ -341,20 +359,20 @@ public abstract class AbstractArchive { return var1; } - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-1387572162" + signature = "(IS)I", + garbageValue = "6161" ) @Export("groupLoadPercent") int groupLoadPercent(int var1) { return this.groups[var1] != null ? 100 : 0; } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(II)[B", - garbageValue = "1651082224" + signature = "(IS)[B", + garbageValue = "19233" ) @Export("takeFileFlat") public byte[] takeFileFlat(int var1) { @@ -367,10 +385,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(III)[B", - garbageValue = "574646503" + garbageValue = "-1676912636" ) @Export("getFile") public byte[] getFile(int var1, int var2) { @@ -386,17 +404,32 @@ public abstract class AbstractArchive { } } - byte[] var4 = FontName.serialize(this.files[var1][var2], false); - return var4; + Object var4 = this.files[var1][var2]; + byte[] var6; + if (var4 == null) { + var6 = null; + } else if (var4 instanceof byte[]) { + byte[] var5 = (byte[])((byte[])var4); + var6 = var5; + } else { + if (!(var4 instanceof AbstractByteArrayCopier)) { + throw new IllegalArgumentException(); + } + + AbstractByteArrayCopier var7 = (AbstractByteArrayCopier)var4; + var6 = var7.get(); + } + + return var6; } else { return null; } } - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IS)[B", - garbageValue = "14651" + signature = "(II)[B", + garbageValue = "1222234626" ) @Export("getFileFlat") public byte[] getFileFlat(int var1) { @@ -409,49 +442,49 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "130067407" + garbageValue = "1606315041" ) @Export("loadGroup") void loadGroup(int var1) { } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(II)[I", - garbageValue = "1555449772" + garbageValue = "1353626049" ) @Export("getGroupFileIds") public int[] getGroupFileIds(int var1) { return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; } - @ObfuscatedName("n") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "526743948" + signature = "(IB)I", + garbageValue = "-34" ) @Export("getGroupFileCount") public int getGroupFileCount(int var1) { return this.files[var1].length; } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-1631712923" + signature = "(S)I", + garbageValue = "24456" ) @Export("getGroupCount") public int getGroupCount() { return this.files.length; } - @ObfuscatedName("s") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "254893440" + signature = "(B)V", + garbageValue = "0" ) @Export("clearGroups") public void clearGroups() { @@ -461,10 +494,10 @@ public abstract class AbstractArchive { } - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-438088964" + garbageValue = "-667248353" ) @Export("clearFilesGroup") public void clearFilesGroup(int var1) { @@ -474,10 +507,10 @@ public abstract class AbstractArchive { } - @ObfuscatedName("m") + @ObfuscatedName("h") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "944527898" + garbageValue = "1078168043" ) @Export("clearFiles") public void clearFiles() { @@ -491,10 +524,10 @@ public abstract class AbstractArchive { } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(I[II)Z", - garbageValue = "1913631817" + garbageValue = "-518851469" ) @Export("buildFiles") boolean buildFiles(int var1, int[] var2) { @@ -516,29 +549,45 @@ public abstract class AbstractArchive { if (var6) { return true; } else { + byte[] var8; byte[] var21; - if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { - var21 = FontName.serialize(this.groups[var1], false); + if (var2 != null && (var2[0] != 0 || var2[1] != 0 || var2[2] != 0 || var2[3] != 0)) { + var21 = class268.serialize(this.groups[var1], true); + Buffer var26 = new Buffer(var21); + var26.xteaDecrypt(var2, 5, var26.array.length); } else { - var21 = FontName.serialize(this.groups[var1], true); - Buffer var8 = new Buffer(var21); - var8.xteaDecrypt(var2, 5, var8.array.length); + Object var9 = this.groups[var1]; + if (var9 == null) { + var8 = null; + } else if (var9 instanceof byte[]) { + byte[] var23 = (byte[])((byte[])var9); + var8 = var23; + } else { + if (!(var9 instanceof AbstractByteArrayCopier)) { + throw new IllegalArgumentException(); + } + + AbstractByteArrayCopier var29 = (AbstractByteArrayCopier)var9; + var8 = var29.get(); + } + + var21 = var8; } - byte[] var25 = class226.decompressBytes(var21); + var8 = Skills.decompressBytes(var21); if (this.releaseGroups) { this.groups[var1] = null; } int var10; if (var3 > 1) { - int var9 = var25.length; - --var9; - var10 = var25[var9] & 255; - var9 -= var10 * var3 * 4; - Buffer var11 = new Buffer(var25); + int var22 = var8.length; + --var22; + var10 = var8[var22] & 255; + var22 -= var3 * var10 * 4; + Buffer var11 = new Buffer(var8); int[] var12 = new int[var3]; - var11.offset = var9; + var11.offset = var22; int var14; int var15; @@ -551,14 +600,14 @@ public abstract class AbstractArchive { } } - byte[][] var22 = new byte[var3][]; + byte[][] var24 = new byte[var3][]; for (var14 = 0; var14 < var3; ++var14) { - var22[var14] = new byte[var12[var14]]; + var24[var14] = new byte[var12[var14]]; var12[var14] = 0; } - var11.offset = var9; + var11.offset = var22; var14 = 0; int var17; @@ -567,7 +616,7 @@ public abstract class AbstractArchive { for (var17 = 0; var17 < var3; ++var17) { var16 += var11.readInt(); - System.arraycopy(var25, var14, var22[var17], var12[var17], var16); + System.arraycopy(var8, var14, var24[var17], var12[var17], var16); var12[var17] += var16; var14 += var16; } @@ -576,7 +625,7 @@ public abstract class AbstractArchive { for (var15 = 0; var15 < var3; ++var15) { if (!this.shallowFiles) { var17 = var4[var15]; - byte[] var19 = var22[var15]; + byte[] var19 = var24[var15]; Object var18; if (var19 == null) { var18 = null; @@ -590,25 +639,25 @@ public abstract class AbstractArchive { var5[var17] = var18; } else { - var5[var4[var15]] = var22[var15]; + var5[var4[var15]] = var24[var15]; } } } else if (!this.shallowFiles) { var10 = var4[0]; - Object var26; - if (var25 == null) { - var26 = null; - } else if (var25.length > 136) { - DirectByteArrayCopier var27 = new DirectByteArrayCopier(); - var27.set(var25); - var26 = var27; + Object var27; + if (var8 == null) { + var27 = null; + } else if (var8.length > 136) { + DirectByteArrayCopier var28 = new DirectByteArrayCopier(); + var28.set(var8); + var27 = var28; } else { - var26 = var25; + var27 = var8; } - var5[var10] = var26; + var5[var10] = var27; } else { - var5[var4[0]] = var25; + var5[var4[0]] = var8; } return true; @@ -616,109 +665,505 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("q") + @ObfuscatedName("aa") @ObfuscatedSignature( signature = "(Ljava/lang/String;I)I", - garbageValue = "282795041" + garbageValue = "-201265341" ) @Export("getGroupId") public int getGroupId(String var1) { var1 = var1.toLowerCase(); - return this.groupNameHashTable.get(class42.hashString(var1)); + return this.groupNameHashTable.get(class81.hashString(var1)); } - @ObfuscatedName("l") + @ObfuscatedName("av") @ObfuscatedSignature( - signature = "(ILjava/lang/String;B)I", - garbageValue = "20" + signature = "(ILjava/lang/String;I)I", + garbageValue = "-531189072" ) @Export("getFileId") public int getFileId(int var1, String var2) { var2 = var2.toLowerCase(); - return this.fileNameHashTables[var1].get(class42.hashString(var2)); + return this.fileNameHashTables[var1].get(class81.hashString(var2)); } - @ObfuscatedName("j") + @ObfuscatedName("aw") @ObfuscatedSignature( signature = "(Ljava/lang/String;Ljava/lang/String;I)Z", - garbageValue = "1492371951" + garbageValue = "-614905429" ) @Export("isValidFileName") public boolean isValidFileName(String var1, String var2) { var1 = var1.toLowerCase(); var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(class42.hashString(var1)); + int var3 = this.groupNameHashTable.get(class81.hashString(var1)); if (var3 < 0) { return false; } else { - int var4 = this.fileNameHashTables[var3].get(class42.hashString(var2)); + int var4 = this.fileNameHashTables[var3].get(class81.hashString(var2)); return var4 >= 0; } } - @ObfuscatedName("ad") + @ObfuscatedName("as") @ObfuscatedSignature( signature = "(Ljava/lang/String;Ljava/lang/String;I)[B", - garbageValue = "2111442561" + garbageValue = "-1446365619" ) @Export("takeFileByNames") public byte[] takeFileByNames(String var1, String var2) { var1 = var1.toLowerCase(); var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(class42.hashString(var1)); - int var4 = this.fileNameHashTables[var3].get(class42.hashString(var2)); + int var3 = this.groupNameHashTable.get(class81.hashString(var1)); + int var4 = this.fileNameHashTables[var3].get(class81.hashString(var2)); return this.takeFile(var3, var4); } - @ObfuscatedName("am") + @ObfuscatedName("ak") @ObfuscatedSignature( signature = "(Ljava/lang/String;Ljava/lang/String;B)Z", - garbageValue = "0" + garbageValue = "-92" ) @Export("tryLoadFileByNames") public boolean tryLoadFileByNames(String var1, String var2) { var1 = var1.toLowerCase(); var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(class42.hashString(var1)); - int var4 = this.fileNameHashTables[var3].get(class42.hashString(var2)); + int var3 = this.groupNameHashTable.get(class81.hashString(var1)); + int var4 = this.fileNameHashTables[var3].get(class81.hashString(var2)); return this.tryLoadFile(var3, var4); } - @ObfuscatedName("ai") + @ObfuscatedName("au") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)Z", - garbageValue = "-14" + signature = "(Ljava/lang/String;I)Z", + garbageValue = "1377272883" ) @Export("tryLoadGroupByName") public boolean tryLoadGroupByName(String var1) { var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(class42.hashString(var1)); + int var2 = this.groupNameHashTable.get(class81.hashString(var1)); return this.tryLoadGroup(var2); } - @ObfuscatedName("ag") + @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "793456202" + signature = "(Ljava/lang/String;S)V", + garbageValue = "1980" ) @Export("loadRegionFromName") public void loadRegionFromName(String var1) { var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(class42.hashString(var1)); + int var2 = this.groupNameHashTable.get(class81.hashString(var1)); if (var2 >= 0) { this.loadRegionFromGroup(var2); } } - @ObfuscatedName("ao") + @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)I", - garbageValue = "2116991634" + signature = "(Ljava/lang/String;S)I", + garbageValue = "27201" ) @Export("groupLoadPercentByName") public int groupLoadPercentByName(String var1) { var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(class42.hashString(var1)); + int var2 = this.groupNameHashTable.get(class81.hashString(var1)); return this.groupLoadPercent(var2); } + + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "(BI)C", + garbageValue = "1023580311" + ) + public static char method4124(byte var0) { + int var1 = var0 & 255; + if (var1 == 0) { + throw new IllegalArgumentException("" + Integer.toString(var1, 16)); + } else { + if (var1 >= 128 && var1 < 160) { + char var2 = class287.cp1252AsciiExtension[var1 - 128]; + if (var2 == 0) { + var2 = '?'; + } + + var1 = var2; + } + + return (char)var1; + } + } + + @ObfuscatedName("av") + @ObfuscatedSignature( + signature = "(ILcu;ZI)I", + garbageValue = "1255135753" + ) + static int method4166(int var0, Script var1, boolean var2) { + String var3; + if (var0 == ScriptOpcodes.MES) { + var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + class83.addGameMessage(0, "", var3); + return 1; + } else if (var0 == ScriptOpcodes.ANIM) { + class188.Interpreter_intStackSize -= 2; + BuddyRankComparator.performPlayerAnimation(Message.localPlayer, Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]); + return 1; + } else if (var0 == ScriptOpcodes.IF_CLOSE) { + if (!Interpreter.field1078) { + Interpreter.field1077 = true; + } + + return 1; + } else { + int var10; + if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { + var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + var10 = 0; + if (SecureRandomFuture.isNumber(var3)) { + var10 = ArchiveDiskActionHandler.parseInt(var3); + } + + PacketBufferNode var12 = class2.getPacketBufferNode(ClientPacket.field2192, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeInt(var10); + Client.packetWriter.addNode(var12); + return 1; + } else { + PacketBufferNode var14; + if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) { + var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + var14 = class2.getPacketBufferNode(ClientPacket.field2271, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeByte(var3.length() + 1); + var14.packetBuffer.writeStringCp1252NullTerminated(var3); + Client.packetWriter.addNode(var14); + return 1; + } else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) { + var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + var14 = class2.getPacketBufferNode(ClientPacket.field2188, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeByte(var3.length() + 1); + var14.packetBuffer.writeStringCp1252NullTerminated(var3); + Client.packetWriter.addNode(var14); + return 1; + } else { + String var7; + int var15; + if (var0 == ScriptOpcodes.OPPLAYER) { + var15 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + WorldMapArea.method364(var15, var7); + return 1; + } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { + class188.Interpreter_intStackSize -= 3; + var15 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var10 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + int var9 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 2]; + Widget var13 = Tile.getWidget(var9); + GrandExchangeOfferNameComparator.clickWidget(var13, var15, var10); + return 1; + } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { + class188.Interpreter_intStackSize -= 2; + var15 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var10 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + Widget var11 = var2 ? UserComparator7.field1946 : class197.field2398; + GrandExchangeOfferNameComparator.clickWidget(var11, var15, var10); + return 1; + } else if (var0 == ScriptOpcodes.MOUSECAM) { + NetFileRequest.mouseCam = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Interpreter.clientPreferences.roofsHidden ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { + Interpreter.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + FriendSystem.savePreferences(); + return 1; + } else if (var0 == ScriptOpcodes.OPENURL) { + var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + boolean var4 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + class13.openURL(var3, var4, false); + return 1; + } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { + var15 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + var14 = class2.getPacketBufferNode(ClientPacket.field2178, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeShort(var15); + Client.packetWriter.addNode(var14); + return 1; + } else if (var0 == ScriptOpcodes.BUG_REPORT) { + var15 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + class65.Interpreter_stringStackSize -= 2; + var7 = Interpreter.Interpreter_stringStack[class65.Interpreter_stringStackSize]; + String var5 = Interpreter.Interpreter_stringStack[class65.Interpreter_stringStackSize + 1]; + if (var7.length() > 500) { + return 1; + } else if (var5.length() > 500) { + return 1; + } else { + PacketBufferNode var6 = class2.getPacketBufferNode(ClientPacket.field2218, Client.packetWriter.isaacCipher); + var6.packetBuffer.writeShort(1 + ViewportMouse.stringCp1252NullTerminatedByteSize(var7) + ViewportMouse.stringCp1252NullTerminatedByteSize(var5)); + var6.packetBuffer.writeStringCp1252NullTerminated(var7); + var6.packetBuffer.writeStringCp1252NullTerminated(var5); + var6.packetBuffer.method5696(var15); + Client.packetWriter.addNode(var6); + return 1; + } + } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { + Client.shiftClickDrop = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { + Client.showMouseOverText = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.RENDERSELF) { + Client.renderSelf = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 3120) { + if (Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 1; + } else { + Client.drawPlayerNames &= -2; + } + + return 1; + } else if (var0 == 3121) { + if (Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 2; + } else { + Client.drawPlayerNames &= -3; + } + + return 1; + } else if (var0 == 3122) { + if (Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 4; + } else { + Client.drawPlayerNames &= -5; + } + + return 1; + } else if (var0 == 3123) { + if (Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 8; + } else { + Client.drawPlayerNames &= -9; + } + + return 1; + } else if (var0 == 3124) { + Client.drawPlayerNames = 0; + return 1; + } else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) { + Client.showMouseCross = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { + Client.showLoadingMessages = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.SETTAPTODROP) { + class295.setTapToDrop(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1); + return 1; + } else if (var0 == ScriptOpcodes.GETTAPTODROP) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = class42.getTapToDrop() ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.SETOCULUSORBSPEED) { + class188.Interpreter_intStackSize -= 2; + Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + return 1; + } else if (var0 == 3130) { + class188.Interpreter_intStackSize -= 2; + return 1; + } else if (var0 == 3131) { + --class188.Interpreter_intStackSize; + return 1; + } else if (var0 == ScriptOpcodes.GETCANVASSIZE) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = GrandExchangeOfferTotalQuantityComparator.canvasWidth; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = AttackOption.canvasHeight; + return 1; + } else if (var0 == ScriptOpcodes.MOBILE_SETFPS) { + --class188.Interpreter_intStackSize; + return 1; + } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) { + return 1; + } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) { + class188.Interpreter_intStackSize -= 2; + return 1; + } else if (var0 == 3136) { + Client.field790 = 3; + Client.field791 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + return 1; + } else if (var0 == 3137) { + Client.field790 = 2; + Client.field791 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + return 1; + } else if (var0 == 3138) { + Client.field790 = 0; + return 1; + } else if (var0 == 3139) { + Client.field790 = 1; + return 1; + } else if (var0 == 3140) { + Client.field790 = 3; + Client.field791 = var2 ? UserComparator7.field1946.id : class197.field2398.id; + return 1; + } else { + boolean var8; + if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { + var8 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + Interpreter.clientPreferences.hideUsername = var8; + FriendSystem.savePreferences(); + return 1; + } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Interpreter.clientPreferences.hideUsername ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { + var8 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + Client.Login_isUsernameRemembered = var8; + if (!var8) { + Interpreter.clientPreferences.rememberedUsername = ""; + FriendSystem.savePreferences(); + } + + return 1; + } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; + return 1; + } else if (var0 == 3145) { + return 1; + } else if (var0 == ScriptOpcodes.SETTITLEMUSICENABLED) { + var8 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + if (var8 == Interpreter.clientPreferences.titleMusicDisabled) { + Interpreter.clientPreferences.titleMusicDisabled = !var8; + FriendSystem.savePreferences(); + } + + return 1; + } else if (var0 == ScriptOpcodes.GETTITLEMUSICENABLED) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Interpreter.clientPreferences.titleMusicDisabled ? 0 : 1; + return 1; + } else if (var0 == 3148) { + return 1; + } else if (var0 == 3149) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3150) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3151) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3152) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3153) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; + return 1; + } else if (var0 == 3154) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = class48.method861(); + return 1; + } else if (var0 == 3155) { + --class65.Interpreter_stringStackSize; + return 1; + } else if (var0 == 3156) { + return 1; + } else if (var0 == 3157) { + class188.Interpreter_intStackSize -= 2; + return 1; + } else if (var0 == 3158) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3159) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3160) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3161) { + --class188.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3162) { + --class188.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3163) { + --class65.Interpreter_stringStackSize; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3164) { + --class188.Interpreter_intStackSize; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + return 1; + } else if (var0 == 3165) { + --class188.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3166) { + class188.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3167) { + class188.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3168) { + class188.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + return 1; + } else if (var0 == 3169) { + return 1; + } else if (var0 == 3170) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3171) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3172) { + --class188.Interpreter_intStackSize; + return 1; + } else if (var0 == 3173) { + --class188.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3174) { + --class188.Interpreter_intStackSize; + return 1; + } else if (var0 == 3175) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3176) { + return 1; + } else if (var0 == 3177) { + return 1; + } else if (var0 == 3178) { + --class65.Interpreter_stringStackSize; + return 1; + } else if (var0 == 3179) { + return 1; + } else if (var0 == 3180) { + --class65.Interpreter_stringStackSize; + return 1; + } else { + return 2; + } + } + } + } + } + } + + @ObfuscatedName("em") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "1" + ) + static final void method4222() { + Scene.Scene_isLowDetail = false; + Client.isLowDetail = false; + } } diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java index 059199fc81..7d02698490 100644 --- a/runescape-client/src/main/java/AbstractByteArrayCopier.java +++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java @@ -2,43 +2,49 @@ 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("gp") +@ObfuscatedName("gu") @Implements("AbstractByteArrayCopier") public abstract class AbstractByteArrayCopier { - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "Lln;" - ) - @Export("leftTitleSprite") - static Sprite leftTitleSprite; - AbstractByteArrayCopier() { } - @ObfuscatedName("b") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(S)[B", - garbageValue = "18982" + signature = "(I)[B", + garbageValue = "-112018699" ) @Export("get") - abstract byte[] get(); + public abstract byte[] get(); - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "([BI)V", - garbageValue = "-1436271820" + signature = "([BB)V", + garbageValue = "33" ) @Export("set") public abstract void set(byte[] var1); - @ObfuscatedName("kg") + @ObfuscatedName("aw") @ObfuscatedSignature( - signature = "(Lhl;B)Z", - garbageValue = "-78" + signature = "(ILcu;ZB)I", + garbageValue = "-27" ) - @Export("isComponentHidden") - static boolean isComponentHidden(Widget var0) { - return var0.isHidden; + static int method3937(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.SOUND_SYNTH) { + class188.Interpreter_intStackSize -= 3; + class268.queueSoundEffect(Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 2]); + return 1; + } else if (var0 == ScriptOpcodes.SOUND_SONG) { + WorldMapSprite.playSong(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); + return 1; + } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { + class188.Interpreter_intStackSize -= 2; + ScriptFrame.playSoundJingle(Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]); + return 1; + } else { + return 2; + } } } diff --git a/runescape-client/src/main/java/AbstractFont.java b/runescape-client/src/main/java/AbstractFont.java index 5159618ab3..67f5235b80 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("kr") +@ObfuscatedName("kn") @Implements("AbstractFont") public abstract class AbstractFont extends Rasterizer2D { - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "[Llm;" + signature = "[Lli;" ) @Export("AbstractFont_modIconSprites") public static IndexedSprite[] AbstractFont_modIconSprites; - @ObfuscatedName("x") + @ObfuscatedName("o") @Export("AbstractFont_strike") static int AbstractFont_strike; - @ObfuscatedName("o") + @ObfuscatedName("v") @Export("AbstractFont_underline") static int AbstractFont_underline; - @ObfuscatedName("e") + @ObfuscatedName("k") @Export("AbstractFont_previousShadow") static int AbstractFont_previousShadow; - @ObfuscatedName("n") + @ObfuscatedName("s") @Export("AbstractFont_shadow") static int AbstractFont_shadow; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("AbstractFont_previousColor") static int AbstractFont_previousColor; - @ObfuscatedName("c") + @ObfuscatedName("t") @Export("AbstractFont_color") static int AbstractFont_color; - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("AbstractFont_alpha") static int AbstractFont_alpha; - @ObfuscatedName("d") + @ObfuscatedName("n") @Export("AbstractFont_justificationTotal") static int AbstractFont_justificationTotal; - @ObfuscatedName("s") + @ObfuscatedName("u") @Export("AbstractFont_justificationCurrent") static int AbstractFont_justificationCurrent; - @ObfuscatedName("t") + @ObfuscatedName("z") @Export("AbstractFont_random") static Random AbstractFont_random; - @ObfuscatedName("m") + @ObfuscatedName("h") @Export("AbstractFont_lines") static String[] AbstractFont_lines; - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("pixels") byte[][] pixels; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("advances") int[] advances; - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("widths") int[] widths; - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("heights") int[] heights; - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("leftBearings") int[] leftBearings; - @ObfuscatedName("p") + @ObfuscatedName("b") @Export("topBearings") int[] topBearings; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("ascent") public int ascent; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("maxAscent") public int maxAscent; - @ObfuscatedName("w") + @ObfuscatedName("a") @Export("maxDescent") public int maxDescent; - @ObfuscatedName("k") + @ObfuscatedName("c") @Export("kerning") byte[] kerning; @@ -123,15 +123,15 @@ public abstract class AbstractFont extends Rasterizer2D { this.readMetrics(var1); } - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("drawGlyph") abstract void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6); - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("drawGlyphAlpha") abstract void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7); - @ObfuscatedName("y") + @ObfuscatedName("b") @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)method5442(var11, var12, var4, this.advances, var10, var13, var8); + this.kerning[var8 + (var13 << 8)] = (byte)method5388(var11, var12, var4, this.advances, var10, var13, var8); } } } @@ -204,17 +204,17 @@ public abstract class AbstractFont extends Rasterizer2D { } - @ObfuscatedName("i") + @ObfuscatedName("x") @Export("charWidth") int charWidth(char var1) { if (var1 == 160) { var1 = ' '; } - return this.advances[Skills.charToByteCp1252(var1) & 255]; + return this.advances[NetSocket.charToByteCp1252(var1) & 255]; } - @ObfuscatedName("k") + @ObfuscatedName("a") @Export("stringWidth") public int stringWidth(String var1) { if (var1 == null) { @@ -238,7 +238,7 @@ public abstract class AbstractFont extends Rasterizer2D { if (!var7.equals("gt")) { if (var7.startsWith("img=")) { try { - int var8 = SoundCache.parseInt(var7.substring(4)); + int var8 = ArchiveDiskActionHandler.parseInt(var7.substring(4)); var4 += AbstractFont_modIconSprites[var8].width; var3 = -1; } catch (Exception var10) { @@ -256,7 +256,7 @@ public abstract class AbstractFont extends Rasterizer2D { } if (var2 == -1) { - var4 += this.advances[(char)(Skills.charToByteCp1252(var6) & 255)]; + var4 += this.advances[(char)(NetSocket.charToByteCp1252(var6) & 255)]; if (this.kerning != null && var3 != -1) { var4 += this.kerning[var6 + (var3 << 8)]; } @@ -270,7 +270,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("x") + @ObfuscatedName("d") @Export("breakLines") public int breakLines(String var1, int[] var2, String[] var3) { if (var1 == null) { @@ -321,7 +321,7 @@ public abstract class AbstractFont extends Rasterizer2D { var11 = '>'; } else if (var16.startsWith("img=")) { try { - int var17 = SoundCache.parseInt(var16.substring(4)); + int var17 = ArchiveDiskActionHandler.parseInt(var16.substring(4)); var4 += AbstractFont_modIconSprites[var17].width; var11 = 0; } catch (Exception var20) { @@ -375,7 +375,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("lineWidth") public int lineWidth(String var1, int var2) { int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines); @@ -391,13 +391,13 @@ public abstract class AbstractFont extends Rasterizer2D { return var4; } - @ObfuscatedName("e") + @ObfuscatedName("o") @Export("lineCount") public int lineCount(String var1, int var2) { return this.breakLines(var1, new int[]{var2}, AbstractFont_lines); } - @ObfuscatedName("c") + @ObfuscatedName("t") @Export("draw") public void draw(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { @@ -406,7 +406,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("s") + @ObfuscatedName("j") @Export("drawAlpha") public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { @@ -416,7 +416,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("t") + @ObfuscatedName("n") @Export("drawRightAligned") public void drawRightAligned(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { @@ -425,7 +425,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("m") + @ObfuscatedName("u") @Export("drawCentered") public void drawCentered(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { @@ -434,7 +434,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("v") + @ObfuscatedName("z") @Export("drawLines") public int drawLines(String var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { if (var1 == null) { @@ -495,7 +495,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("drawCenteredWave") public void drawCenteredWave(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { @@ -510,7 +510,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("l") + @ObfuscatedName("m") @Export("drawCenteredWave2") public void drawCenteredWave2(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { @@ -527,7 +527,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("j") + @ObfuscatedName("aa") @Export("drawCenteredShake") public void drawCenteredShake(String var1, int var2, int var3, int var4, int var5, int var6, int var7) { if (var1 != null) { @@ -547,7 +547,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("ad") + @ObfuscatedName("av") @Export("drawRandomAlphaAndSpacing") public void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { @@ -568,7 +568,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("am") + @ObfuscatedName("aw") @Export("reset") void reset(int var1, int var2) { AbstractFont_strike = -1; @@ -582,38 +582,28 @@ public abstract class AbstractFont extends Rasterizer2D { AbstractFont_justificationCurrent = 0; } - @ObfuscatedName("ai") + @ObfuscatedName("as") @Export("decodeTag") void decodeTag(String var1) { try { - int var2; - String var3; if (var1.startsWith("col=")) { - var3 = var1.substring(4); - var2 = UserComparator8.parseIntCustomRadix(var3, 16, true); - AbstractFont_color = var2; + AbstractFont_color = VerticalAlignment.method4326(var1.substring(4), 16); } else if (var1.equals("/col")) { AbstractFont_color = AbstractFont_previousColor; } else if (var1.startsWith("str=")) { - var3 = var1.substring(4); - var2 = UserComparator8.parseIntCustomRadix(var3, 16, true); - AbstractFont_strike = var2; + AbstractFont_strike = VerticalAlignment.method4326(var1.substring(4), 16); } else if (var1.equals("str")) { AbstractFont_strike = 8388608; } else if (var1.equals("/str")) { AbstractFont_strike = -1; } else if (var1.startsWith("u=")) { - var3 = var1.substring(2); - var2 = UserComparator8.parseIntCustomRadix(var3, 16, true); - AbstractFont_underline = var2; + AbstractFont_underline = VerticalAlignment.method4326(var1.substring(2), 16); } else if (var1.equals("u")) { AbstractFont_underline = 0; } else if (var1.equals("/u")) { AbstractFont_underline = -1; } else if (var1.startsWith("shad=")) { - var3 = var1.substring(5); - var2 = UserComparator8.parseIntCustomRadix(var3, 16, true); - AbstractFont_shadow = var2; + AbstractFont_shadow = VerticalAlignment.method4326(var1.substring(5), 16); } else if (var1.equals("shad")) { AbstractFont_shadow = 0; } else if (var1.equals("/shad")) { @@ -621,12 +611,12 @@ public abstract class AbstractFont extends Rasterizer2D { } else if (var1.equals("br")) { this.reset(AbstractFont_previousColor, AbstractFont_previousShadow); } - } catch (Exception var5) { + } catch (Exception var3) { } } - @ObfuscatedName("ag") + @ObfuscatedName("ak") @Export("calculateLineJustification") void calculateLineJustification(String var1, int var2) { int var3 = 0; @@ -649,7 +639,7 @@ public abstract class AbstractFont extends Rasterizer2D { } - @ObfuscatedName("ao") + @ObfuscatedName("au") @Export("draw0") void draw0(String var1, int var2, int var3) { var3 -= this.ascent; @@ -658,7 +648,7 @@ public abstract class AbstractFont extends Rasterizer2D { for (int var6 = 0; var6 < var1.length(); ++var6) { if (var1.charAt(var6) != 0) { - char var7 = (char)(Skills.charToByteCp1252(var1.charAt(var6)) & 255); + char var7 = (char)(NetSocket.charToByteCp1252(var1.charAt(var6)) & 255); if (var7 == '<') { var4 = var6; } else { @@ -672,7 +662,7 @@ public abstract class AbstractFont extends Rasterizer2D { if (!var8.equals("gt")) { if (var8.startsWith("img=")) { try { - var9 = SoundCache.parseInt(var8.substring(4)); + var9 = ArchiveDiskActionHandler.parseInt(var8.substring(4)); IndexedSprite var10 = AbstractFont_modIconSprites[var9]; var10.drawAt(var2, var3 + this.ascent - var10.height); var2 += var10.width; @@ -738,7 +728,7 @@ public abstract class AbstractFont extends Rasterizer2D { } - @ObfuscatedName("aw") + @ObfuscatedName("ah") @Export("drawWithOffsets0") void drawWithOffsets0(String var1, int var2, int var3, int[] var4, int[] var5) { var3 -= this.ascent; @@ -748,7 +738,7 @@ public abstract class AbstractFont extends Rasterizer2D { for (int var9 = 0; var9 < var1.length(); ++var9) { if (var1.charAt(var9) != 0) { - char var10 = (char)(Skills.charToByteCp1252(var1.charAt(var9)) & 255); + char var10 = (char)(NetSocket.charToByteCp1252(var1.charAt(var9)) & 255); if (var10 == '<') { var6 = var9; } else { @@ -777,7 +767,7 @@ public abstract class AbstractFont extends Rasterizer2D { } ++var8; - var14 = SoundCache.parseInt(var11.substring(4)); + var14 = ArchiveDiskActionHandler.parseInt(var11.substring(4)); IndexedSprite var15 = AbstractFont_modIconSprites[var14]; var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height)); var2 += var15.width; @@ -856,8 +846,8 @@ public abstract class AbstractFont extends Rasterizer2D { } - @ObfuscatedName("w") - static int method5442(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) { + @ObfuscatedName("e") + static int method5388(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]; @@ -892,7 +882,7 @@ public abstract class AbstractFont extends Rasterizer2D { return -var13; } - @ObfuscatedName("n") + @ObfuscatedName("l") @Export("escapeBrackets") public static String escapeBrackets(String var0) { int var1 = var0.length(); @@ -921,7 +911,7 @@ public abstract class AbstractFont extends Rasterizer2D { return var6.toString(); } - @ObfuscatedName("ak") + @ObfuscatedName("aq") @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; @@ -963,7 +953,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("aa") + @ObfuscatedName("ao") @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); @@ -1011,7 +1001,7 @@ public abstract class AbstractFont extends Rasterizer2D { } - @ObfuscatedName("ab") + @ObfuscatedName("an") @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; diff --git a/runescape-client/src/main/java/AbstractRasterProvider.java b/runescape-client/src/main/java/AbstractRasterProvider.java index 8d474318fb..53702e52e4 100644 --- a/runescape-client/src/main/java/AbstractRasterProvider.java +++ b/runescape-client/src/main/java/AbstractRasterProvider.java @@ -4,21 +4,21 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lp") +@ObfuscatedName("lk") @Implements("AbstractRasterProvider") public abstract class AbstractRasterProvider { - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("pixels") public int[] pixels; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1041400109 + intValue = -2051103705 ) @Export("width") public int width; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -854439651 + intValue = 705915003 ) @Export("height") public int height; @@ -26,26 +26,26 @@ public abstract class AbstractRasterProvider { protected AbstractRasterProvider() { } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "0" + signature = "(III)V", + garbageValue = "1570881200" ) @Export("drawFull") public abstract void drawFull(int var1, int var2); - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "-787999204" + signature = "(IIIIB)V", + garbageValue = "-116" ) @Export("draw") public abstract void draw(int var1, int var2, int var3, int var4); - @ObfuscatedName("t") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "-30907" + signature = "(I)V", + garbageValue = "1390931728" ) @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 14ed855360..6f7cfab31f 100644 --- a/runescape-client/src/main/java/AbstractSocket.java +++ b/runescape-client/src/main/java/AbstractSocket.java @@ -4,56 +4,56 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kn") +@ObfuscatedName("ky") @Implements("AbstractSocket") public abstract class AbstractSocket { protected AbstractSocket() { } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-29" + signature = "(I)V", + garbageValue = "-647274291" ) @Export("close") public abstract void close(); - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "27" + signature = "(I)I", + garbageValue = "2115277231" ) @Export("readUnsignedByte") public abstract int readUnsignedByte() throws IOException; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-53" + signature = "(I)I", + garbageValue = "-972484659" ) @Export("available") public abstract int available() throws IOException; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "-1591428004" + garbageValue = "497635177" ) @Export("isAvailable") public abstract boolean isAvailable(int var1) throws IOException; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "([BIIB)I", - garbageValue = "29" + signature = "([BIII)I", + garbageValue = "-1642271193" ) @Export("read") public abstract int read(byte[] var1, int var2, int var3) throws IOException; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "([BIII)V", - garbageValue = "-543253817" + garbageValue = "-340382115" ) @Export("write") public abstract void write(byte[] var1, int var2, int var3) throws IOException; diff --git a/runescape-client/src/main/java/AbstractSound.java b/runescape-client/src/main/java/AbstractSound.java index 7862953b3e..544120b7ae 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("dl") +@ObfuscatedName("ds") @Implements("AbstractSound") public abstract class AbstractSound extends Node { - @ObfuscatedName("p") + @ObfuscatedName("b") @Export("position") int position; diff --git a/runescape-client/src/main/java/AbstractUserComparator.java b/runescape-client/src/main/java/AbstractUserComparator.java index c8885f3a9e..ae0db8b06e 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("jq") +@ObfuscatedName("jm") @Implements("AbstractUserComparator") public abstract class AbstractUserComparator implements Comparator { - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("nextComparator") Comparator nextComparator; protected AbstractUserComparator() { } - @ObfuscatedName("w") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(Ljava/util/Comparator;I)V", - garbageValue = "314545919" + signature = "(Ljava/util/Comparator;B)V", + garbageValue = "1" ) @Export("addComparator") final void addComparator(Comparator var1) { @@ -29,10 +29,10 @@ public abstract class AbstractUserComparator implements Comparator { } - @ObfuscatedName("i") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Ljr;Ljr;B)I", - garbageValue = "14" + signature = "(Ljy;Ljy;I)I", + garbageValue = "-1667132208" ) @Export("compareUser") protected final int compareUser(User var1, User var2) { @@ -42,4 +42,78 @@ public abstract class AbstractUserComparator implements Comparator { public boolean equals(Object var1) { return super.equals(var1); } + + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "(II)Liw;", + garbageValue = "928288295" + ) + @Export("getNpcDefinition") + public static NPCDefinition getNpcDefinition(int var0) { + NPCDefinition var1 = (NPCDefinition)NPCDefinition.NpcDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = NPCDefinition.NpcDefinition_archive.takeFile(9, var0); + var1 = new NPCDefinition(); + var1.id = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); + NPCDefinition.NpcDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("gw") + @ObfuscatedSignature( + signature = "(Lha;IIB)V", + garbageValue = "-91" + ) + @Export("checkIfMinimapClicked") + static final void checkIfMinimapClicked(Widget var0, int var1, int var2) { + if (Client.minimapState == 0 || Client.minimapState == 3) { + if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !NetFileRequest.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { + SpriteMask var3 = var0.getSpriteMask(true); + if (var3 == null) { + return; + } + + int var4 = MouseHandler.MouseHandler_lastPressedX - var1; + int var5 = MouseHandler.MouseHandler_lastPressedY - var2; + if (var3.contains(var4, var5)) { + var4 -= var3.width / 2; + var5 -= var3.height / 2; + int var6 = Client.camAngleY & 2047; + int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; + int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; + int var9 = var8 * var4 + var5 * var7 >> 11; + int var10 = var5 * var8 - var4 * var7 >> 11; + int var11 = var9 + Message.localPlayer.x >> 7; + int var12 = Message.localPlayer.y - var10 >> 7; + PacketBufferNode var13 = class2.getPacketBufferNode(ClientPacket.field2212, Client.packetWriter.isaacCipher); + var13.packetBuffer.writeByte(18); + var13.packetBuffer.method5696(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); + var13.packetBuffer.writeShort(MusicPatchPcmStream.baseX * 64 + var11); + var13.packetBuffer.writeIntME(ScriptEvent.baseY * 64 + var12); + var13.packetBuffer.writeByte(var4); + var13.packetBuffer.writeByte(var5); + var13.packetBuffer.writeShort(Client.camAngleY); + var13.packetBuffer.writeByte(57); + var13.packetBuffer.writeByte(0); + var13.packetBuffer.writeByte(0); + var13.packetBuffer.writeByte(89); + var13.packetBuffer.writeShort(Message.localPlayer.x); + var13.packetBuffer.writeShort(Message.localPlayer.y); + var13.packetBuffer.writeByte(63); + Client.packetWriter.addNode(var13); + Client.destinationX = var11; + Client.destinationY = var12; + } + } + + } + } } diff --git a/runescape-client/src/main/java/AbstractWorldMapData.java b/runescape-client/src/main/java/AbstractWorldMapData.java index 0bc7432133..cd78bcdc66 100644 --- a/runescape-client/src/main/java/AbstractWorldMapData.java +++ b/runescape-client/src/main/java/AbstractWorldMapData.java @@ -4,115 +4,127 @@ 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("h") @Implements("AbstractWorldMapData") public abstract class AbstractWorldMapData { - @ObfuscatedName("dl") - @ObfuscatedSignature( - signature = "Lij;" - ) - @Export("archive6") - static Archive archive6; - @ObfuscatedName("u") + @ObfuscatedName("qa") @ObfuscatedGetter( - intValue = 111975616 + intValue = 1014546432 + ) + static int field147; + @ObfuscatedName("db") + @ObfuscatedSignature( + signature = "Lif;" + ) + @Export("archive5") + static Archive archive5; + @ObfuscatedName("dm") + @ObfuscatedSignature( + signature = "Lif;" + ) + @Export("archive18") + static Archive archive18; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -1789439424 ) @Export("regionXLow") int regionXLow; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1782706176 + intValue = 810971136 ) @Export("regionYLow") int regionYLow; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -577212613 + intValue = 826366773 ) @Export("regionX") int regionX; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -248705921 + intValue = -20485777 ) @Export("regionY") int regionY; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1296595709 + intValue = 185589827 ) @Export("minPlane") int minPlane; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 380384989 + intValue = -1464369351 ) @Export("planes") int planes; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1445814981 + intValue = 2104808793 ) @Export("groupId") int groupId; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1373242491 + intValue = -299525603 ) @Export("fileId") int fileId; - @ObfuscatedName("w") + @ObfuscatedName("a") @Export("floorUnderlayIds") short[][][] floorUnderlayIds; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("floorOverlayIds") short[][][] floorOverlayIds; - @ObfuscatedName("k") - byte[][][] field166; - @ObfuscatedName("x") - byte[][][] field160; + @ObfuscatedName("c") + byte[][][] field150; @ObfuscatedName("o") + byte[][][] field149; + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "[[[[Lj;" + signature = "[[[[Lq;" ) @Export("decorations") WorldMapDecoration[][][][] decorations; - @ObfuscatedName("e") - boolean field169; - @ObfuscatedName("n") - boolean field167; + @ObfuscatedName("k") + boolean field153; + @ObfuscatedName("s") + boolean field154; AbstractWorldMapData() { this.groupId = -1; this.fileId = -1; new LinkedList(); - this.field169 = false; - this.field167 = false; + this.field153 = false; + this.field154 = false; } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkg;B)V", - garbageValue = "35" + signature = "(Lkq;I)V", + garbageValue = "1425420215" ) @Export("readGeography") abstract void readGeography(Buffer var1); - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1722967008" + garbageValue = "890560047" ) @Export("isFullyLoaded") boolean isFullyLoaded() { - return this.field169 && this.field167; + return this.field153 && this.field154; } - @ObfuscatedName("h") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lhf;I)V", - garbageValue = "222528841" + signature = "(Lhz;I)V", + garbageValue = "-1774423787" ) @Export("loadGeography") void loadGeography(AbstractArchive var1) { @@ -120,53 +132,53 @@ public abstract class AbstractWorldMapData { byte[] var2 = var1.takeFile(this.groupId, this.fileId); if (var2 != null) { this.readGeography(new Buffer(var2)); - this.field169 = true; - this.field167 = true; + this.field153 = true; + this.field154 = true; } } } - @ObfuscatedName("y") + @ObfuscatedName("a") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1687680184" + garbageValue = "-1921381610" ) @Export("reset") void reset() { this.floorUnderlayIds = null; this.floorOverlayIds = null; - this.field166 = null; - this.field160 = null; + this.field150 = null; + this.field149 = null; this.decorations = null; - this.field169 = false; - this.field167 = false; + this.field153 = false; + this.field154 = false; } - @ObfuscatedName("w") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(IILkg;B)V", - garbageValue = "3" + signature = "(IILkq;I)V", + garbageValue = "-1827340514" ) @Export("readTile") void readTile(int var1, int var2, Buffer var3) { int var4 = var3.readUnsignedByte(); if (var4 != 0) { if ((var4 & 1) != 0) { - this.method278(var1, var2, var3, var4); + this.method247(var1, var2, var3, var4); } else { - this.method279(var1, var2, var3, var4); + this.method269(var1, var2, var3, var4); } } } - @ObfuscatedName("i") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IILkg;IB)V", - garbageValue = "92" + signature = "(IILkq;II)V", + garbageValue = "947555268" ) - void method278(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(); @@ -175,12 +187,12 @@ public abstract class AbstractWorldMapData { this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); } - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IILkg;II)V", - garbageValue = "1096070019" + signature = "(IILkq;IB)V", + garbageValue = "77" ) - void method279(int var1, int var2, Buffer var3, int var4) { + void method269(int var1, int var2, Buffer var3, int var4) { int var5 = ((var4 & 24) >> 3) + 1; boolean var6 = (var4 & 2) != 0; boolean var7 = (var4 & 4) != 0; @@ -196,8 +208,8 @@ public abstract class AbstractWorldMapData { if (var10 != 0) { this.floorOverlayIds[var9][var1][var2] = (short)var10; var11 = var3.readUnsignedByte(); - this.field166[var9][var1][var2] = (byte)(var11 >> 2); - this.field160[var9][var1][var2] = (byte)(var11 & 3); + this.field150[var9][var1][var2] = (byte)(var11 >> 2); + this.field149[var9][var1][var2] = (byte)(var11 & 3); } } } @@ -209,7 +221,7 @@ public abstract class AbstractWorldMapData { WorldMapDecoration[] var14 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9]; for (var11 = 0; var11 < var9; ++var11) { - int var12 = var3.method5618(); + int var12 = var3.method5560(); int var13 = var3.readUnsignedByte(); var14[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3); } @@ -219,56 +231,1205 @@ public abstract class AbstractWorldMapData { } - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1505128614" + signature = "(B)I", + garbageValue = "58" ) @Export("getRegionX") int getRegionX() { return this.regionX; } - @ObfuscatedName("o") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "-8" + garbageValue = "63" ) @Export("getRegionY") int getRegionY() { return this.regionY; } - @ObfuscatedName("u") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;I)I", - garbageValue = "493677830" + signature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V", + garbageValue = "4" ) - public static int method284(CharSequence var0) { - int var1 = var0.length(); - int var2 = 0; + @Export("setLoginResponseString") + static void setLoginResponseString(String var0, String var1, String var2) { + Login.Login_response1 = var0; + Login.Login_response2 = var1; + Login.Login_response3 = var2; + } - for (int var3 = 0; var3 < var1; ++var3) { - char var4 = var0.charAt(var3); - if (var4 <= 127) { - ++var2; - } else if (var4 <= 2047) { - var2 += 2; + @ObfuscatedName("ad") + @ObfuscatedSignature( + signature = "(ILcu;ZI)I", + garbageValue = "357466702" + ) + static int method272(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = MouseRecorder.loadWorlds() ? 1 : 0; + return 1; + } else { + World var3; + if (var0 == ScriptOpcodes.WORLDLIST_START) { + var3 = ChatChannel.worldListStart(); + if (var3 != null) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.id; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.properties; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3.activity; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.location; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.population; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3.host; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { + var3 = Friend.getNextWorldListWorld(); + if (var3 != null) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.id; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.properties; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3.activity; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.location; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.population; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3.host; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + } + + return 1; } else { - var2 += 3; + World var4; + int var5; + int var7; + if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { + var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + var4 = null; + + for (var5 = 0; var5 < World.World_count; ++var5) { + if (var7 == class162.World_worlds[var5].id) { + var4 = class162.World_worlds[var5]; + break; + } + } + + if (var4 != null) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var4.id; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var4.properties; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var4.activity; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var4.location; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var4.population; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var4.host; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { + class188.Interpreter_intStackSize -= 4; + var7 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + boolean var10 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1] == 1; + var5 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 2]; + boolean var6 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 3] == 1; + Player.sortWorldList(var7, var10, var5, var6); + return 1; + } else if (var0 != ScriptOpcodes.GETWORLDINFO) { + if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { + Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + return 1; + } else { + int var8; + ParamDefinition var9; + if (var0 == ScriptOpcodes.NC_PARAM) { + class188.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + var9 = WorldMapIcon_1.getParamDefinition(var8); + if (var9.isString()) { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = AbstractUserComparator.getNpcDefinition(var7).getStringParam(var8, var9.defaultStr); + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = AbstractUserComparator.getNpcDefinition(var7).getIntParam(var8, var9.defaultInt); + } + + return 1; + } else if (var0 == ScriptOpcodes.LC_PARAM) { + class188.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + var9 = WorldMapIcon_1.getParamDefinition(var8); + if (var9.isString()) { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = Coord.getObjectDefinition(var7).getStringParam(var8, var9.defaultStr); + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Coord.getObjectDefinition(var7).getIntParam(var8, var9.defaultInt); + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_PARAM) { + class188.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + var9 = WorldMapIcon_1.getParamDefinition(var8); + if (var9.isString()) { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = PacketBufferNode.ItemDefinition_get(var7).getStringParam(var8, var9.defaultStr); + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = PacketBufferNode.ItemDefinition_get(var7).getIntParam(var8, var9.defaultInt); + } + + return 1; + } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { + class188.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + var9 = WorldMapIcon_1.getParamDefinition(var8); + if (var9.isString()) { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = KitDefinition.StructDefinition_getStructDefinition(var7).getStringParam(var8, var9.defaultStr); + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = KitDefinition.StructDefinition_getStructDefinition(var7).getIntParam(var8, var9.defaultInt); + } + + return 1; + } else if (var0 == ScriptOpcodes.ON_MOBILE) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CLIENTTYPE) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.clientType & 3; + return 1; + } else if (var0 == 6520) { + return 1; + } else if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) { + return 1; + } else if (var0 == 6522) { + --class65.Interpreter_stringStackSize; + --class188.Interpreter_intStackSize; + return 1; + } else if (var0 == 6523) { + --class65.Interpreter_stringStackSize; + --class188.Interpreter_intStackSize; + return 1; + } else if (var0 == ScriptOpcodes.BATTERYLEVEL) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; + return 1; + } else if (var0 == ScriptOpcodes.BATTERYCHARGING) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 1; + return 1; + } else if (var0 == ScriptOpcodes.WIFIAVAILABLE) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 1; + return 1; + } else { + return 2; + } + } + } else { + var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + if (var7 >= 0 && var7 < World.World_count) { + var4 = class162.World_worlds[var7]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var4.id; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var4.properties; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var4.activity; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var4.location; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var4.population; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var4.host; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } + } + } + } + + @ObfuscatedName("ir") + @ObfuscatedSignature( + signature = "(IIIILjava/lang/String;Ljava/lang/String;III)V", + garbageValue = "-803158058" + ) + @Export("menuAction") + static final void menuAction(int var0, int var1, int var2, int var3, String var4, String var5, int var6, int var7) { + if (var2 >= 2000) { + var2 -= 2000; + } + + PacketBufferNode var8; + if (var2 == 1) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = class2.getPacketBufferNode(ClientPacket.field2228, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntME(MusicPatchPcmStream.baseX * 64 + var0); + var8.packetBuffer.method5744(Occluder.selectedItemWidget); + var8.packetBuffer.writeIntME(ScriptEvent.baseY * 64 + var1); + var8.packetBuffer.method5746(var3); + var8.packetBuffer.method5579(KeyHandler.selectedItemSlot); + var8.packetBuffer.method5569(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method5579(IsaacCipher.selectedItemId); + Client.packetWriter.addNode(var8); + } else if (var2 == 2) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = class2.getPacketBufferNode(ClientPacket.field2199, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5579(var3); + var8.packetBuffer.method5744(WorldMapDecoration.selectedSpellWidget); + var8.packetBuffer.method5746(MusicPatchPcmStream.baseX * 64 + var0); + var8.packetBuffer.writeShort(Client.selectedSpellChildIndex); + var8.packetBuffer.method5579(ScriptEvent.baseY * 64 + var1); + var8.packetBuffer.method5569(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var8); + } else if (var2 == 3) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = class2.getPacketBufferNode(ClientPacket.field2233, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5720(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.writeIntME(var3); + var8.packetBuffer.method5579(ScriptEvent.baseY * 64 + var1); + var8.packetBuffer.method5746(MusicPatchPcmStream.baseX * 64 + var0); + Client.packetWriter.addNode(var8); + } else if (var2 == 4) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = class2.getPacketBufferNode(ClientPacket.field2265, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5579(var3); + var8.packetBuffer.method5696(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method5579(ScriptEvent.baseY * 64 + var1); + var8.packetBuffer.method5579(MusicPatchPcmStream.baseX * 64 + var0); + Client.packetWriter.addNode(var8); + } else if (var2 == 5) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = class2.getPacketBufferNode(ClientPacket.field2264, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntME(var3); + var8.packetBuffer.method5696(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method5746(ScriptEvent.baseY * 64 + var1); + var8.packetBuffer.method5579(MusicPatchPcmStream.baseX * 64 + var0); + Client.packetWriter.addNode(var8); + } else if (var2 == 6) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = class2.getPacketBufferNode(ClientPacket.field2248, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5579(var3); + var8.packetBuffer.writeIntME(MusicPatchPcmStream.baseX * 64 + var0); + var8.packetBuffer.method5720(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method5746(ScriptEvent.baseY * 64 + var1); + Client.packetWriter.addNode(var8); + } else { + PacketBufferNode var9; + NPC var13; + if (var2 == 7) { + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = class2.getPacketBufferNode(ClientPacket.field2270, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeIntME(IsaacCipher.selectedItemId); + var9.packetBuffer.writeIntME(KeyHandler.selectedItemSlot); + var9.packetBuffer.method5744(Occluder.selectedItemWidget); + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method5579(var3); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 8) { + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = class2.getPacketBufferNode(ClientPacket.field2213, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShortLE(WorldMapDecoration.selectedSpellWidget); + var9.packetBuffer.method5579(var3); + var9.packetBuffer.method5746(Client.selectedSpellChildIndex); + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 9) { + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = class2.getPacketBufferNode(ClientPacket.field2208, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5569(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.writeIntME(var3); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 10) { + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = class2.getPacketBufferNode(ClientPacket.field2224, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5579(var3); + var9.packetBuffer.method5569(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 11) { + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = class2.getPacketBufferNode(ClientPacket.field2256, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method5579(var3); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 12) { + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = class2.getPacketBufferNode(ClientPacket.field2266, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5569(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 13) { + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = class2.getPacketBufferNode(ClientPacket.field2215, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5746(var3); + var9.packetBuffer.method5720(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); + } + } else { + Player var15; + if (var2 == 14) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = class2.getPacketBufferNode(ClientPacket.field2239, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeInt(Occluder.selectedItemWidget); + var9.packetBuffer.method5720(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.writeShort(KeyHandler.selectedItemSlot); + var9.packetBuffer.writeIntME(IsaacCipher.selectedItemId); + var9.packetBuffer.method5746(var3); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 15) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = class2.getPacketBufferNode(ClientPacket.field2217, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5569(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method5746(var3); + var9.packetBuffer.writeInt(WorldMapDecoration.selectedSpellWidget); + var9.packetBuffer.writeIntME(Client.selectedSpellChildIndex); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 16) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = class2.getPacketBufferNode(ClientPacket.field2257, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5720(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.writeShort(KeyHandler.selectedItemSlot); + var8.packetBuffer.writeShortLE(Occluder.selectedItemWidget); + var8.packetBuffer.method5746(IsaacCipher.selectedItemId); + var8.packetBuffer.method5746(var3); + var8.packetBuffer.method5746(ScriptEvent.baseY * 64 + var1); + var8.packetBuffer.writeIntME(MusicPatchPcmStream.baseX * 64 + var0); + Client.packetWriter.addNode(var8); + } else if (var2 == 17) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = class2.getPacketBufferNode(ClientPacket.field2263, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeInt(WorldMapDecoration.selectedSpellWidget); + var8.packetBuffer.writeIntME(ScriptEvent.baseY * 64 + var1); + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method5746(var3); + var8.packetBuffer.method5746(MusicPatchPcmStream.baseX * 64 + var0); + var8.packetBuffer.method5579(Client.selectedSpellChildIndex); + Client.packetWriter.addNode(var8); + } else if (var2 == 18) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = class2.getPacketBufferNode(ClientPacket.field2201, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntME(var3); + var8.packetBuffer.method5746(ScriptEvent.baseY * 64 + var1); + var8.packetBuffer.method5720(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method5579(MusicPatchPcmStream.baseX * 64 + var0); + Client.packetWriter.addNode(var8); + } else if (var2 == 19) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = class2.getPacketBufferNode(ClientPacket.field2189, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5720(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method5746(ScriptEvent.baseY * 64 + var1); + var8.packetBuffer.writeShort(MusicPatchPcmStream.baseX * 64 + var0); + var8.packetBuffer.method5579(var3); + Client.packetWriter.addNode(var8); + } else if (var2 == 20) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = class2.getPacketBufferNode(ClientPacket.field2272, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5579(MusicPatchPcmStream.baseX * 64 + var0); + var8.packetBuffer.method5569(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.writeIntME(var3); + var8.packetBuffer.method5746(ScriptEvent.baseY * 64 + var1); + Client.packetWriter.addNode(var8); + } else if (var2 == 21) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = class2.getPacketBufferNode(ClientPacket.field2243, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntME(MusicPatchPcmStream.baseX * 64 + var0); + var8.packetBuffer.writeShort(var3); + var8.packetBuffer.writeIntME(ScriptEvent.baseY * 64 + var1); + var8.packetBuffer.method5696(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var8); + } else if (var2 == 22) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = class2.getPacketBufferNode(ClientPacket.field2258, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5746(ScriptEvent.baseY * 64 + var1); + var8.packetBuffer.method5746(var3); + var8.packetBuffer.method5696(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method5746(MusicPatchPcmStream.baseX * 64 + var0); + Client.packetWriter.addNode(var8); + } else if (var2 == 23) { + if (Client.isMenuOpen) { + class14.scene.setViewportWalking(); + } else { + class14.scene.menuOpen(UrlRequest.Client_plane, var0, var1, true); + } + } else { + PacketBufferNode var10; + Widget var16; + if (var2 == 24) { + var16 = Tile.getWidget(var1); + boolean var12 = true; + if (var16.contentType > 0) { + var12 = GrandExchangeOfferNameComparator.method136(var16); + } + + if (var12) { + var10 = class2.getPacketBufferNode(ClientPacket.field2220, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var10); + } + } else { + if (var2 == 25) { + var16 = BZip2State.getWidgetChild(var1, var0); + if (var16 != null) { + GrandExchangeOfferUnitPriceComparator.Widget_runOnTargetLeave(); + WorldMapData_0.selectSpell(var1, var0, class14.method157(WorldMapSection0.getWidgetClickMask(var16)), var16.itemId); + Client.isItemSelected = 0; + Client.selectedSpellActionName = class60.method1167(var16); + if (Client.selectedSpellActionName == null) { + Client.selectedSpellActionName = "null"; + } + + if (var16.isIf3) { + Client.selectedSpellName = var16.dataText + NPC.colorStartTag(16777215); + } else { + Client.selectedSpellName = NPC.colorStartTag(65280) + var16.spellName + NPC.colorStartTag(16777215); + } + } + + return; + } + + if (var2 == 26) { + Clock.method3488(); + } else { + int var11; + Widget var14; + if (var2 == 28) { + var8 = class2.getPacketBufferNode(ClientPacket.field2220, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var8); + var14 = Tile.getWidget(var1); + if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { + var11 = var14.cs1Instructions[0][1]; + Varps.Varps_main[var11] = 1 - Varps.Varps_main[var11]; + BufferedSink.changeGameOptions(var11); + } + } else if (var2 == 29) { + var8 = class2.getPacketBufferNode(ClientPacket.field2220, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var8); + var14 = Tile.getWidget(var1); + if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { + var11 = var14.cs1Instructions[0][1]; + if (Varps.Varps_main[var11] != var14.cs1ComparisonValues[0]) { + Varps.Varps_main[var11] = var14.cs1ComparisonValues[0]; + BufferedSink.changeGameOptions(var11); + } + } + } else if (var2 == 30) { + if (Client.meslayerContinueWidget == null) { + WorldMapRectangle.resumePauseWidget(var1, var0); + Client.meslayerContinueWidget = BZip2State.getWidgetChild(var1, var0); + LoginPacket.invalidateWidget(Client.meslayerContinueWidget); + } + } else if (var2 == 31) { + var8 = class2.getPacketBufferNode(ClientPacket.field2185, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5746(IsaacCipher.selectedItemId); + var8.packetBuffer.method5587(Occluder.selectedItemWidget); + var8.packetBuffer.writeIntME(KeyHandler.selectedItemSlot); + var8.packetBuffer.method5587(var1); + var8.packetBuffer.method5746(var3); + var8.packetBuffer.method5579(var0); + Client.packetWriter.addNode(var8); + Client.field764 = 0; + class192.field2372 = Tile.getWidget(var1); + Client.field735 = var0; + } else if (var2 == 32) { + var8 = class2.getPacketBufferNode(ClientPacket.field2237, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5579(var0); + var8.packetBuffer.method5744(WorldMapDecoration.selectedSpellWidget); + var8.packetBuffer.writeIntME(var3); + var8.packetBuffer.writeIntME(Client.selectedSpellChildIndex); + var8.packetBuffer.method5587(var1); + Client.packetWriter.addNode(var8); + Client.field764 = 0; + class192.field2372 = Tile.getWidget(var1); + Client.field735 = var0; + } else if (var2 == 33) { + var8 = class2.getPacketBufferNode(ClientPacket.field2207, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5587(var1); + var8.packetBuffer.writeIntME(var3); + var8.packetBuffer.method5579(var0); + Client.packetWriter.addNode(var8); + Client.field764 = 0; + class192.field2372 = Tile.getWidget(var1); + Client.field735 = var0; + } else if (var2 == 34) { + var8 = class2.getPacketBufferNode(ClientPacket.field2261, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5746(var0); + var8.packetBuffer.writeShort(var3); + var8.packetBuffer.method5587(var1); + Client.packetWriter.addNode(var8); + Client.field764 = 0; + class192.field2372 = Tile.getWidget(var1); + Client.field735 = var0; + } else if (var2 == 35) { + var8 = class2.getPacketBufferNode(ClientPacket.field2197, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShortLE(var1); + var8.packetBuffer.method5579(var0); + var8.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var8); + Client.field764 = 0; + class192.field2372 = Tile.getWidget(var1); + Client.field735 = var0; + } else if (var2 == 36) { + var8 = class2.getPacketBufferNode(ClientPacket.field2190, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5579(var3); + var8.packetBuffer.writeShortLE(var1); + var8.packetBuffer.writeShort(var0); + Client.packetWriter.addNode(var8); + Client.field764 = 0; + class192.field2372 = Tile.getWidget(var1); + Client.field735 = var0; + } else if (var2 == 37) { + var8 = class2.getPacketBufferNode(ClientPacket.field2227, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5746(var0); + var8.packetBuffer.method5746(var3); + var8.packetBuffer.method5587(var1); + Client.packetWriter.addNode(var8); + Client.field764 = 0; + class192.field2372 = Tile.getWidget(var1); + Client.field735 = var0; + } else { + if (var2 == 38) { + GrandExchangeOfferUnitPriceComparator.Widget_runOnTargetLeave(); + var16 = Tile.getWidget(var1); + Client.isItemSelected = 1; + KeyHandler.selectedItemSlot = var0; + Occluder.selectedItemWidget = var1; + IsaacCipher.selectedItemId = var3; + LoginPacket.invalidateWidget(var16); + Client.selectedItemName = NPC.colorStartTag(16748608) + PacketBufferNode.ItemDefinition_get(var3).name + NPC.colorStartTag(16777215); + if (Client.selectedItemName == null) { + Client.selectedItemName = "null"; + } + + return; + } + + if (var2 == 39) { + var8 = class2.getPacketBufferNode(ClientPacket.field2196, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5744(var1); + var8.packetBuffer.writeIntME(var0); + var8.packetBuffer.writeIntME(var3); + Client.packetWriter.addNode(var8); + Client.field764 = 0; + class192.field2372 = Tile.getWidget(var1); + Client.field735 = var0; + } else if (var2 == 40) { + var8 = class2.getPacketBufferNode(ClientPacket.field2253, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5746(var0); + var8.packetBuffer.method5587(var1); + var8.packetBuffer.method5746(var3); + Client.packetWriter.addNode(var8); + Client.field764 = 0; + class192.field2372 = Tile.getWidget(var1); + Client.field735 = var0; + } else if (var2 == 41) { + var8 = class2.getPacketBufferNode(ClientPacket.field2247, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5746(var0); + var8.packetBuffer.writeInt(var1); + var8.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var8); + Client.field764 = 0; + class192.field2372 = Tile.getWidget(var1); + Client.field735 = var0; + } else if (var2 == 42) { + var8 = class2.getPacketBufferNode(ClientPacket.field2211, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5579(var3); + var8.packetBuffer.writeShort(var0); + var8.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var8); + Client.field764 = 0; + class192.field2372 = Tile.getWidget(var1); + Client.field735 = var0; + } else if (var2 == 43) { + var8 = class2.getPacketBufferNode(ClientPacket.field2181, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5587(var1); + var8.packetBuffer.writeIntME(var0); + var8.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var8); + Client.field764 = 0; + class192.field2372 = Tile.getWidget(var1); + Client.field735 = var0; + } else if (var2 == 44) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = class2.getPacketBufferNode(ClientPacket.field2222, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5746(var3); + var9.packetBuffer.method5569(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 45) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = class2.getPacketBufferNode(ClientPacket.field2250, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5696(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.writeIntME(var3); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 46) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = class2.getPacketBufferNode(ClientPacket.field2269, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5720(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 47) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = class2.getPacketBufferNode(ClientPacket.field2273, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5696(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.writeIntME(var3); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 48) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = class2.getPacketBufferNode(ClientPacket.field2267, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShort(var3); + var9.packetBuffer.method5720(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 49) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = class2.getPacketBufferNode(ClientPacket.field2214, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5720(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method5579(var3); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 50) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = class2.getPacketBufferNode(ClientPacket.field2235, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5720(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method5746(var3); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 51) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = class2.getPacketBufferNode(ClientPacket.field2203, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShort(var3); + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); + } + } else { + label888: { + if (var2 != 57) { + if (var2 == 58) { + var16 = BZip2State.getWidgetChild(var1, var0); + if (var16 != null) { + var9 = class2.getPacketBufferNode(ClientPacket.field2275, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5746(var0); + var9.packetBuffer.writeShortLE(var1); + var9.packetBuffer.method5579(Client.selectedSpellChildIndex); + var9.packetBuffer.method5746(var16.itemId); + var9.packetBuffer.method5746(Client.field785); + var9.packetBuffer.method5744(WorldMapDecoration.selectedSpellWidget); + Client.packetWriter.addNode(var9); + } + break label888; + } + + if (var2 == 1001) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = class2.getPacketBufferNode(ClientPacket.field2230, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5746(var3); + var8.packetBuffer.method5579(ScriptEvent.baseY * 64 + var1); + var8.packetBuffer.writeShort(MusicPatchPcmStream.baseX * 64 + var0); + var8.packetBuffer.method5720(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var8); + break label888; + } + + if (var2 == 1002) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + var8 = class2.getPacketBufferNode(ClientPacket.field2184, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntME(var3); + Client.packetWriter.addNode(var8); + break label888; + } + + if (var2 == 1003) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + var13 = Client.npcs[var3]; + if (var13 != null) { + NPCDefinition var17 = var13.definition; + if (var17.transforms != null) { + var17 = var17.transform(); + } + + if (var17 != null) { + var10 = class2.getPacketBufferNode(ClientPacket.field2194, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeIntME(var17.id); + Client.packetWriter.addNode(var10); + } + } + break label888; + } + + if (var2 == 1004) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + var8 = class2.getPacketBufferNode(ClientPacket.field2234, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5746(var3); + Client.packetWriter.addNode(var8); + break label888; + } + + if (var2 == 1005) { + var16 = Tile.getWidget(var1); + if (var16 != null && var16.itemQuantities[var0] >= 100000) { + class83.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + PacketBufferNode.ItemDefinition_get(var3).name); + } else { + var9 = class2.getPacketBufferNode(ClientPacket.field2234, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5746(var3); + Client.packetWriter.addNode(var9); + } + + Client.field764 = 0; + class192.field2372 = Tile.getWidget(var1); + Client.field735 = var0; + break label888; + } + + if (var2 != 1007) { + if (var2 == 1009 || var2 == 1011 || var2 == 1010 || var2 == 1008 || var2 == 1012) { + GrandExchangeEvent.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); + } + break label888; + } + } + + var16 = BZip2State.getWidgetChild(var1, var0); + if (var16 != null) { + KeyHandler.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); + } + } + } + } + } + } + } } } - return var2; + if (Client.isItemSelected != 0) { + Client.isItemSelected = 0; + LoginPacket.invalidateWidget(Tile.getWidget(Occluder.selectedItemWidget)); + } + + if (Client.isSpellSelected) { + GrandExchangeOfferUnitPriceComparator.Widget_runOnTargetLeave(); + } + + if (class192.field2372 != null && Client.field764 == 0) { + LoginPacket.invalidateWidget(class192.field2372); + } + } - @ObfuscatedName("w") + @ObfuscatedName("jy") @ObfuscatedSignature( - signature = "(CI)Z", - garbageValue = "-858513722" + signature = "(Lha;III)V", + garbageValue = "2081657202" ) - @Export("isDigit") - public static boolean isDigit(char var0) { - return var0 >= '0' && var0 <= '9'; + static final void method263(Widget var0, int var1, int var2) { + if (var0.buttonType == 1) { + class1.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); + } + + String var3; + if (var0.buttonType == 2 && !Client.isSpellSelected) { + var3 = class60.method1167(var0); + if (var3 != null) { + class1.insertMenuItemNoShift(var3, NPC.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); + } + } + + if (var0.buttonType == 3) { + class1.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); + } + + if (var0.buttonType == 4) { + class1.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); + } + + if (var0.buttonType == 5) { + class1.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); + } + + if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { + class1.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); + } + + int var4; + int var5; + int var6; + int var7; + int var13; + if (var0.type == 2) { + var13 = 0; + + for (var4 = 0; var4 < var0.height; ++var4) { + for (var5 = 0; var5 < var0.width; ++var5) { + var6 = (var0.paddingX + 32) * var5; + var7 = (var0.paddingY + 32) * var4; + if (var13 < 20) { + var6 += var0.inventoryXOffsets[var13]; + var7 += var0.inventoryYOffsets[var13]; + } + + if (var1 >= var6 && var2 >= var7 && var1 < var6 + 32 && var2 < var7 + 32) { + Client.dragItemSlotDestination = var13; + WorldMapManager.field312 = var0; + if (var0.itemIds[var13] > 0) { + ItemDefinition var8 = PacketBufferNode.ItemDefinition_get(var0.itemIds[var13] - 1); + if (Client.isItemSelected == 1 && class30.method542(WorldMapSection0.getWidgetClickMask(var0))) { + if (var0.id != Occluder.selectedItemWidget || var13 != KeyHandler.selectedItemSlot) { + class1.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + NPC.colorStartTag(16748608) + var8.name, 31, var8.id, var13, var0.id); + } + } else if (Client.isSpellSelected && class30.method542(WorldMapSection0.getWidgetClickMask(var0))) { + if ((ReflectionCheck.selectedSpellFlags & 16) == 16) { + class1.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + NPC.colorStartTag(16748608) + var8.name, 32, var8.id, var13, var0.id); + } + } else { + String[] var9 = var8.inventoryActions; + int var10 = -1; + if (Client.shiftClickDrop && WorldMapDecoration.method326()) { + var10 = var8.getShiftClickIndex(); + } + + int var11; + if (class30.method542(WorldMapSection0.getWidgetClickMask(var0))) { + for (var11 = 4; var11 >= 3; --var11) { + if (var11 != var10) { + class312.addWidgetItemMenuItem(var0, var8, var13, var11, false); + } + } + } + + if (Varcs.method2195(WorldMapSection0.getWidgetClickMask(var0))) { + class1.insertMenuItemNoShift("Use", NPC.colorStartTag(16748608) + var8.name, 38, var8.id, var13, var0.id); + } + + if (class30.method542(WorldMapSection0.getWidgetClickMask(var0))) { + for (var11 = 2; var11 >= 0; --var11) { + if (var10 != var11) { + class312.addWidgetItemMenuItem(var0, var8, var13, var11, false); + } + } + + if (var10 >= 0) { + class312.addWidgetItemMenuItem(var0, var8, var13, var10, true); + } + } + + var9 = var0.itemActions; + if (var9 != null) { + for (var11 = 4; var11 >= 0; --var11) { + if (var9[var11] != null) { + byte var12 = 0; + if (var11 == 0) { + var12 = 39; + } + + if (var11 == 1) { + var12 = 40; + } + + if (var11 == 2) { + var12 = 41; + } + + if (var11 == 3) { + var12 = 42; + } + + if (var11 == 4) { + var12 = 43; + } + + class1.insertMenuItemNoShift(var9[var11], NPC.colorStartTag(16748608) + var8.name, var12, var8.id, var13, var0.id); + } + } + } + + class1.insertMenuItemNoShift("Examine", NPC.colorStartTag(16748608) + var8.name, 1005, var8.id, var13, var0.id); + } + } + } + + ++var13; + } + } + } + + if (var0.isIf3) { + if (Client.isSpellSelected) { + if (Login.method2119(WorldMapSection0.getWidgetClickMask(var0)) && (ReflectionCheck.selectedSpellFlags & 32) == 32) { + class1.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); + } + } else { + for (var13 = 9; var13 >= 5; --var13) { + var6 = WorldMapSection0.getWidgetClickMask(var0); + boolean var18 = (var6 >> var13 + 1 & 1) != 0; + String var14; + if (!var18 && var0.onOp == null) { + var14 = null; + } else if (var0.actions != null && var0.actions.length > var13 && var0.actions[var13] != null && var0.actions[var13].trim().length() != 0) { + var14 = var0.actions[var13]; + } else { + var14 = null; + } + + if (var14 != null) { + class1.insertMenuItemNoShift(var14, var0.dataText, 1007, var13 + 1, var0.childIndex, var0.id); + } + } + + var3 = class60.method1167(var0); + if (var3 != null) { + class1.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); + } + + for (var4 = 4; var4 >= 0; --var4) { + var7 = WorldMapSection0.getWidgetClickMask(var0); + boolean var19 = (var7 >> var4 + 1 & 1) != 0; + String var15; + if (!var19 && var0.onOp == null) { + var15 = null; + } else if (var0.actions != null && var0.actions.length > var4 && var0.actions[var4] != null && var0.actions[var4].trim().length() != 0) { + var15 = var0.actions[var4]; + } else { + var15 = null; + } + + if (var15 != null) { + AbstractWorldMapIcon.insertMenuItem(var15, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.field2602); + } + } + + var5 = WorldMapSection0.getWidgetClickMask(var0); + boolean var17 = (var5 & 1) != 0; + if (var17) { + class1.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); + } + } + } + } } diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java index 9720d35568..fa6d70539a 100644 --- a/runescape-client/src/main/java/AbstractWorldMapIcon.java +++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java @@ -3,102 +3,90 @@ 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("aa") +@ObfuscatedName("ao") @Implements("AbstractWorldMapIcon") public abstract class AbstractWorldMapIcon { - @ObfuscatedName("qk") - @ObfuscatedGetter( - intValue = 1263704437 - ) - static int field299; - @ObfuscatedName("as") - @Export("client") + @ObfuscatedName("bl") @ObfuscatedSignature( - signature = "Lclient;" + signature = "Lhq;" ) - static Client client; - @ObfuscatedName("ey") + static StudioGame field284; + @ObfuscatedName("by") @ObfuscatedSignature( - signature = "Lij;" + signature = "[Lli;" ) - @Export("archive17") - static Archive archive17; - @ObfuscatedName("ef") - @ObfuscatedGetter( - intValue = 821874025 - ) - static int field292; - @ObfuscatedName("h") + @Export("worldSelectFlagSprites") + static IndexedSprite[] worldSelectFlagSprites; + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lhx;" + signature = "Lht;" ) @Export("coord2") public final Coord coord2; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lhx;" + signature = "Lht;" ) @Export("coord1") public final Coord coord1; - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 148025221 + intValue = 130683095 ) @Export("screenX") int screenX; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 316665889 + intValue = -170696787 ) @Export("screenY") int screenY; @ObfuscatedSignature( - signature = "(Lhx;Lhx;)V" + signature = "(Lht;Lht;)V" ) AbstractWorldMapIcon(Coord var1, Coord var2) { this.coord1 = var1; this.coord2 = var2; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-871583687" + signature = "(B)I", + garbageValue = "63" ) @Export("getElement") public abstract int getElement(); - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(I)Lam;", - garbageValue = "969160497" + signature = "(I)Law;", + garbageValue = "-1801186977" ) @Export("getLabel") abstract WorldMapLabel getLabel(); - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-55298135" + garbageValue = "-2033351231" ) @Export("getSubWidth") abstract int getSubWidth(); - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-51" + signature = "(I)I", + garbageValue = "1873129621" ) @Export("getSubHeight") abstract int getSubHeight(); - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(IIB)Z", - garbageValue = "34" + signature = "(III)Z", + garbageValue = "-1038278508" ) @Export("fitsScreen") boolean fitsScreen(int var1, int var2) { @@ -109,38 +97,37 @@ public abstract class AbstractWorldMapIcon { } } - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "1140208309" + signature = "(B)Z", + garbageValue = "3" ) @Export("hasValidElement") boolean hasValidElement() { return this.getElement() >= 0; } - @ObfuscatedName("t") + @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "(IIB)Z", - garbageValue = "75" + signature = "(III)Z", + garbageValue = "-2033564740" ) @Export("elementFitsScreen") boolean elementFitsScreen(int var1, int var2) { if (!this.hasValidElement()) { return false; } else { - WorldMapElement var3 = Varcs.WorldMapElement_get(this.getElement()); + WorldMapElement var3 = GrandExchangeOfferUnitPriceComparator.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; + if (var1 <= this.screenX - var4 || var1 > this.screenX) { + return false; } - - return false; + break; case 1: - if (var1 > this.screenX - var4 && var1 <= this.screenX) { + if (var1 >= this.screenX && var1 < var4 + this.screenX) { break; } @@ -153,7 +140,7 @@ public abstract class AbstractWorldMapIcon { switch(var3.verticalAlignment.value) { case 0: - if (var2 < this.screenY || var2 >= var5 + this.screenY) { + if (var2 <= this.screenY - var5 || var2 > this.screenY) { return false; } break; @@ -163,7 +150,7 @@ public abstract class AbstractWorldMapIcon { } break; case 2: - if (var2 <= this.screenY - var5 || var2 > this.screenY) { + if (var2 < this.screenY || var2 >= var5 + this.screenY) { return false; } } @@ -172,10 +159,10 @@ public abstract class AbstractWorldMapIcon { } } - @ObfuscatedName("m") + @ObfuscatedName("av") @ObfuscatedSignature( signature = "(III)Z", - garbageValue = "-1821247860" + garbageValue = "501002350" ) @Export("labelFitsScreen") boolean labelFitsScreen(int var1, int var2) { @@ -189,83 +176,421 @@ public abstract class AbstractWorldMapIcon { } } - @ObfuscatedName("u") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lhf;Lhf;ZB)V", - garbageValue = "28" + signature = "([BI)V", + garbageValue = "-1395894499" ) - public static void method625(AbstractArchive var0, AbstractArchive var1, boolean var2) { - ObjectDefinition.ObjectDefinition_archive = var0; - ObjectDefinition.ObjectDefinition_modelsArchive = var1; - ObjectDefinition.ObjectDefinition_isLowDetail = var2; + @Export("SpriteBuffer_decode") + static void SpriteBuffer_decode(byte[] var0) { + Buffer var1 = new Buffer(var0); + var1.offset = var0.length - 2; + class325.SpriteBuffer_spriteCount = var1.readUnsignedShort(); + class325.SpriteBuffer_xOffsets = new int[class325.SpriteBuffer_spriteCount]; + class325.SpriteBuffer_yOffsets = new int[class325.SpriteBuffer_spriteCount]; + UserComparator1.SpriteBuffer_spriteWidths = new int[class325.SpriteBuffer_spriteCount]; + class325.SpriteBuffer_spriteHeights = new int[class325.SpriteBuffer_spriteCount]; + class290.SpriteBuffer_pixels = new byte[class325.SpriteBuffer_spriteCount][]; + var1.offset = var0.length - 7 - class325.SpriteBuffer_spriteCount * 8; + class325.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); + class325.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); + int var2 = (var1.readUnsignedByte() & 255) + 1; + + int var3; + for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) { + class325.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) { + class325.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) { + UserComparator1.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) { + class325.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); + } + + var1.offset = var0.length - 7 - class325.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; + class268.SpriteBuffer_spritePalette = new int[var2]; + + for (var3 = 1; var3 < var2; ++var3) { + class268.SpriteBuffer_spritePalette[var3] = var1.readMedium(); + if (class268.SpriteBuffer_spritePalette[var3] == 0) { + class268.SpriteBuffer_spritePalette[var3] = 1; + } + } + + var1.offset = 0; + + for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) { + int var4 = UserComparator1.SpriteBuffer_spriteWidths[var3]; + int var5 = class325.SpriteBuffer_spriteHeights[var3]; + int var6 = var4 * var5; + byte[] var7 = new byte[var6]; + class290.SpriteBuffer_pixels[var3] = var7; + int var8 = var1.readUnsignedByte(); + int var9; + if (var8 == 0) { + for (var9 = 0; var9 < var6; ++var9) { + var7[var9] = var1.readByte(); + } + } else if (var8 == 1) { + for (var9 = 0; var9 < var4; ++var9) { + for (int var10 = 0; var10 < var5; ++var10) { + var7[var9 + var10 * var4] = var1.readByte(); + } + } + } + } + } - @ObfuscatedName("h") + @ObfuscatedName("fp") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "1" + signature = "(ZI)V", + garbageValue = "294564457" ) - static void method623() { - Messages.Messages_channels.clear(); - Messages.Messages_hashTable.clear(); - Messages.Messages_queue.clear(); - Messages.Messages_count = 0; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "(ILci;ZI)I", - garbageValue = "1136599608" - ) - static int method618(int var0, Script var1, boolean var2) { - Widget var3 = Language.getWidget(Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]); - if (var0 == ScriptOpcodes.IF_GETSCROLLX) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.scrollX; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.scrollY; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETTEXT) { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var3.text; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.scrollWidth; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.scrollHeight; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.modelZoom; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.modelAngleX; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.modelAngleZ; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.modelAngleY; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETTRANSTOP) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.transparencyTop; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETTRANSBOT) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.transparencyBot; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.color; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.color2; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETFILLMODE) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); - return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; - return 1; + static final void method612(boolean var0) { + if (var0) { + Client.field743 = Login.field1178 ? class160.field1984 : class160.field1986; } else { - return 2; + Client.field743 = Interpreter.clientPreferences.parameters.containsKey(UrlRequester.method3299(Login.Login_username)) ? class160.field1988 : class160.field1985; + } + + } + + @ObfuscatedName("hw") + @ObfuscatedSignature( + signature = "(Lfi;I)V", + garbageValue = "-432214243" + ) + static final void method614(class179 var0) { + PacketBuffer var1 = Client.packetWriter.packetBuffer; + int var2; + int var3; + int var4; + int var5; + int var6; + int var7; + int var8; + int var9; + if (class179.field2293 == var0) { + var2 = var1.method5628(); + var3 = (var2 >> 4 & 7) + class3.field7; + var4 = (var2 & 7) + PlayerAppearance.field2520; + var5 = var1.method5723(); + var6 = var1.readUnsignedByte(); + var7 = var6 >> 2; + var8 = var6 & 3; + var9 = Client.field689[var7]; + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { + class65.updatePendingSpawn(UrlRequest.Client_plane, var3, var4, var9, var5, var7, var8, 0, -1); + } + + } else if (class179.field2290 == var0) { + var2 = var1.method5582(); + var3 = var1.method5723(); + var4 = var1.readUnsignedByte(); + var5 = (var4 >> 4 & 7) + class3.field7; + var6 = (var4 & 7) + PlayerAppearance.field2520; + var7 = var1.method5675(); + if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { + var5 = var5 * 128 + 64; + var6 = var6 * 128 + 64; + GraphicsObject var43 = new GraphicsObject(var2, UrlRequest.Client_plane, var5, var6, ScriptEvent.getTileHeight(var5, var6, UrlRequest.Client_plane) - var7, var3, Client.cycle); + Client.graphicsObjects.addFirst(var43); + } + + } else { + TileItem var32; + if (class179.field2295 == var0) { + var2 = var1.method5582(); + var3 = var1.method5583(); + var4 = var1.readUnsignedByte(); + var5 = (var4 >> 4 & 7) + class3.field7; + var6 = (var4 & 7) + PlayerAppearance.field2520; + if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { + var32 = new TileItem(); + var32.id = var2; + var32.quantity = var3; + if (Client.groundItems[UrlRequest.Client_plane][var5][var6] == null) { + Client.groundItems[UrlRequest.Client_plane][var5][var6] = new NodeDeque(); + } + + Client.groundItems[UrlRequest.Client_plane][var5][var6].addFirst(var32); + Skills.updateItemPile(var5, var6); + } + + } else { + int var10; + if (class179.field2297 == var0) { + var2 = var1.method5723(); + var3 = var1.method5675(); + var4 = var1.method5572(); + var5 = (var4 >> 4 & 7) + class3.field7; + var6 = (var4 & 7) + PlayerAppearance.field2520; + var7 = var1.method5675(); + var8 = var7 >> 4 & 15; + var9 = var7 & 7; + if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { + var10 = var8 + 1; + if (Message.localPlayer.pathX[0] >= var5 - var10 && Message.localPlayer.pathX[0] <= var5 + var10 && Message.localPlayer.pathY[0] >= var6 - var10 && Message.localPlayer.pathY[0] <= var10 + var6 && Client.areaSoundEffectVolume != 0 && var9 > 0 && Client.soundEffectCount < 50) { + Client.soundEffectIds[Client.soundEffectCount] = var2; + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var9; + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var3; + Client.soundEffects[Client.soundEffectCount] = null; + Client.soundLocations[Client.soundEffectCount] = var8 + (var6 << 8) + (var5 << 16); + ++Client.soundEffectCount; + } + } + } + + int var14; + int var39; + if (class179.field2289 == var0) { + var2 = var1.readUnsignedByte(); + var3 = var1.method5675() * 4; + var4 = var1.method5723(); + byte var38 = var1.method5577(); + var6 = var1.method5723(); + var7 = var1.method5572(); + var8 = (var7 >> 4 & 7) + class3.field7; + var9 = (var7 & 7) + PlayerAppearance.field2520; + var10 = var1.method5584(); + var39 = var1.method5675(); + int var40 = var1.method5583(); + int var41 = var1.method5572() * 4; + byte var42 = var1.method5577(); + var14 = var42 + var8; + var5 = var38 + var9; + if (var8 >= 0 && var9 >= 0 && var8 < 104 && var9 < 104 && var14 >= 0 && var5 >= 0 && var14 < 104 && var5 < 104 && var6 != 65535) { + var8 = var8 * 128 + 64; + var9 = var9 * 128 + 64; + var14 = var14 * 128 + 64; + var5 = var5 * 128 + 64; + Projectile var15 = new Projectile(var6, UrlRequest.Client_plane, var8, var9, ScriptEvent.getTileHeight(var8, var9, UrlRequest.Client_plane) - var3, var40 + Client.cycle, var4 + Client.cycle, var2, var39, var10, var41); + var15.setDestination(var14, var5, ScriptEvent.getTileHeight(var14, var5, UrlRequest.Client_plane) - var41, var40 + Client.cycle); + Client.projectiles.addFirst(var15); + } + + } else if (class179.field2296 == var0) { + var2 = var1.method5572(); + var3 = var2 >> 2; + var4 = var2 & 3; + var5 = Client.field689[var3]; + var6 = var1.readUnsignedByte(); + var7 = (var6 >> 4 & 7) + class3.field7; + var8 = (var6 & 7) + PlayerAppearance.field2520; + if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { + class65.updatePendingSpawn(UrlRequest.Client_plane, var7, var8, var5, -1, var3, var4, 0, -1); + } + + } else if (class179.field2294 == var0) { + var2 = var1.method5583(); + var3 = var1.method5582(); + var4 = var1.method5723(); + var5 = var1.method5675(); + var6 = (var5 >> 4 & 7) + class3.field7; + var7 = (var5 & 7) + PlayerAppearance.field2520; + if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { + NodeDeque var31 = Client.groundItems[UrlRequest.Client_plane][var6][var7]; + if (var31 != null) { + for (TileItem var33 = (TileItem)var31.last(); var33 != null; var33 = (TileItem)var31.previous()) { + if ((var3 & 32767) == var33.id && var4 == var33.quantity) { + var33.quantity = var2; + break; + } + } + + Skills.updateItemPile(var6, var7); + } + } + + } else if (class179.field2291 == var0) { + var2 = var1.method5628(); + var3 = (var2 >> 4 & 7) + class3.field7; + var4 = (var2 & 7) + PlayerAppearance.field2520; + var5 = var1.method5582(); + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { + NodeDeque var34 = Client.groundItems[UrlRequest.Client_plane][var3][var4]; + if (var34 != null) { + for (var32 = (TileItem)var34.last(); var32 != null; var32 = (TileItem)var34.previous()) { + if ((var5 & 32767) == var32.id) { + var32.remove(); + break; + } + } + + if (var34.last() == null) { + Client.groundItems[UrlRequest.Client_plane][var3][var4] = null; + } + + Skills.updateItemPile(var3, var4); + } + } + + } else if (class179.field2292 == var0) { + var2 = var1.method5675(); + var3 = (var2 >> 4 & 7) + class3.field7; + var4 = (var2 & 7) + PlayerAppearance.field2520; + var5 = var1.method5572(); + var6 = var5 >> 2; + var7 = var5 & 3; + var8 = Client.field689[var6]; + var9 = var1.method5582(); + if (var3 >= 0 && var4 >= 0 && var3 < 103 && var4 < 103) { + if (var8 == 0) { + BoundaryObject var35 = class14.scene.method3112(UrlRequest.Client_plane, var3, var4); + if (var35 != null) { + var39 = class2.Entity_unpackID(var35.tag); + if (var6 == 2) { + var35.entity1 = new DynamicObject(var39, 2, var7 + 4, UrlRequest.Client_plane, var3, var4, var9, false, var35.entity1); + var35.entity2 = new DynamicObject(var39, 2, var7 + 1 & 3, UrlRequest.Client_plane, var3, var4, var9, false, var35.entity2); + } else { + var35.entity1 = new DynamicObject(var39, var6, var7, UrlRequest.Client_plane, var3, var4, var9, false, var35.entity1); + } + } + } + + if (var8 == 1) { + WallDecoration var44 = class14.scene.method3113(UrlRequest.Client_plane, var3, var4); + if (var44 != null) { + var39 = class2.Entity_unpackID(var44.tag); + if (var6 != 4 && var6 != 5) { + if (var6 == 6) { + var44.entity1 = new DynamicObject(var39, 4, var7 + 4, UrlRequest.Client_plane, var3, var4, var9, false, var44.entity1); + } else if (var6 == 7) { + var44.entity1 = new DynamicObject(var39, 4, (var7 + 2 & 3) + 4, UrlRequest.Client_plane, var3, var4, var9, false, var44.entity1); + } else if (var6 == 8) { + var44.entity1 = new DynamicObject(var39, 4, var7 + 4, UrlRequest.Client_plane, var3, var4, var9, false, var44.entity1); + var44.entity2 = new DynamicObject(var39, 4, (var7 + 2 & 3) + 4, UrlRequest.Client_plane, var3, var4, var9, false, var44.entity2); + } + } else { + var44.entity1 = new DynamicObject(var39, 4, var7, UrlRequest.Client_plane, var3, var4, var9, false, var44.entity1); + } + } + } + + if (var8 == 2) { + GameObject var45 = class14.scene.method3114(UrlRequest.Client_plane, var3, var4); + if (var6 == 11) { + var6 = 10; + } + + if (var45 != null) { + var45.entity = new DynamicObject(class2.Entity_unpackID(var45.tag), var6, var7, UrlRequest.Client_plane, var3, var4, var9, false, var45.entity); + } + } + + if (var8 == 3) { + FloorDecoration var46 = class14.scene.getFloorDecoration(UrlRequest.Client_plane, var3, var4); + if (var46 != null) { + var46.entity = new DynamicObject(class2.Entity_unpackID(var46.tag), 22, var7, UrlRequest.Client_plane, var3, var4, var9, false, var46.entity); + } + } + } + + } else { + if (class179.field2298 == var0) { + byte var37 = var1.readByte(); + var3 = var1.method5583(); + var4 = var1.method5675(); + var5 = (var4 >> 4 & 7) + class3.field7; + var6 = (var4 & 7) + PlayerAppearance.field2520; + var7 = var1.method5572(); + var8 = var7 >> 2; + var9 = var7 & 3; + var10 = Client.field689[var8]; + byte var11 = var1.readByte(); + byte var12 = var1.method5576(); + byte var13 = var1.method5575(); + var14 = var1.readUnsignedShort(); + int var36 = var1.method5582(); + int var16 = var1.readUnsignedShort(); + Player var17; + if (var36 == Client.localPlayerIndex) { + var17 = Message.localPlayer; + } else { + var17 = Client.players[var36]; + } + + if (var17 != null) { + ObjectDefinition var18 = Coord.getObjectDefinition(var16); + int var19; + int var20; + if (var9 != 1 && var9 != 3) { + var19 = var18.sizeX; + var20 = var18.sizeY; + } else { + var19 = var18.sizeY; + var20 = var18.sizeX; + } + + int var21 = var5 + (var19 >> 1); + int var22 = var5 + (var19 + 1 >> 1); + int var23 = var6 + (var20 >> 1); + int var24 = var6 + (var20 + 1 >> 1); + int[][] var25 = Tiles.Tiles_heights[UrlRequest.Client_plane]; + int var26 = var25[var22][var24] + var25[var21][var23] + var25[var22][var23] + var25[var21][var24] >> 2; + int var27 = (var5 << 7) + (var19 << 6); + int var28 = (var6 << 7) + (var20 << 6); + Model var29 = var18.getModel(var8, var9, var25, var27, var26, var28); + if (var29 != null) { + class65.updatePendingSpawn(UrlRequest.Client_plane, var5, var6, var10, -1, 0, 0, var3 + 1, var14 + 1); + var17.animationCycleStart = var3 + Client.cycle; + var17.animationCycleEnd = var14 + Client.cycle; + var17.model0 = var29; + var17.field601 = var5 * 128 + var19 * 64; + var17.field603 = var6 * 128 + var20 * 64; + var17.tileHeight2 = var26; + byte var30; + if (var13 > var11) { + var30 = var13; + var13 = var11; + var11 = var30; + } + + if (var37 > var12) { + var30 = var37; + var37 = var12; + var12 = var30; + } + + var17.field605 = var13 + var5; + var17.field607 = var5 + var11; + var17.field606 = var37 + var6; + var17.field608 = var6 + var12; + } + } + } + + } + } + } + } + + @ObfuscatedName("is") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V", + garbageValue = "-1072362060" + ) + @Export("insertMenuItem") + static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) { + if (!Client.isMenuOpen) { + if (Client.menuOptionsCount < 500) { + Client.menuActions[Client.menuOptionsCount] = var0; + Client.menuTargets[Client.menuOptionsCount] = var1; + Client.menuOpcodes[Client.menuOptionsCount] = var2; + Client.menuIdentifiers[Client.menuOptionsCount] = var3; + Client.menuArguments1[Client.menuOptionsCount] = var4; + Client.menuArguments2[Client.menuOptionsCount] = var5; + Client.menuShiftClick[Client.menuOptionsCount] = var6; + ++Client.menuOptionsCount; + } + } } } diff --git a/runescape-client/src/main/java/AccessFile.java b/runescape-client/src/main/java/AccessFile.java index 71d75f894f..c492b5ddd0 100644 --- a/runescape-client/src/main/java/AccessFile.java +++ b/runescape-client/src/main/java/AccessFile.java @@ -9,21 +9,21 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("md") +@ObfuscatedName("mk") @Implements("AccessFile") public final class AccessFile { - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("file") RandomAccessFile file; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - longValue = -1982697081356352199L + longValue = -2099605315629278245L ) @Export("maxSize") final long maxSize; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - longValue = 797587694615508853L + longValue = 9136921121469373871L ) @Export("offset") long offset; @@ -49,17 +49,17 @@ public final class AccessFile { this.file.seek(0L); } - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("seek") final void seek(long var1) throws IOException { this.file.seek(var1); this.offset = var1; } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "([BIII)V", - garbageValue = "2100291593" + signature = "([BIIB)V", + garbageValue = "87" ) @Export("write") public final void write(byte[] var1, int var2, int var3) throws IOException { @@ -73,20 +73,20 @@ public final class AccessFile { } } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-108" + signature = "(I)V", + garbageValue = "-1441194559" ) @Export("close") public final void close() throws IOException { this.closeSync(false); } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "-687857713" + signature = "(ZS)V", + garbageValue = "180" ) @Export("closeSync") public final void closeSync(boolean var1) throws IOException { @@ -104,20 +104,20 @@ public final class AccessFile { } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(I)J", - garbageValue = "-266154110" + garbageValue = "-1766264538" ) @Export("length") public final long length() throws IOException { return this.file.length(); } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( signature = "([BIII)I", - garbageValue = "-309112442" + garbageValue = "1663251439" ) @Export("read") public final int read(byte[] var1, int var2, int var3) throws IOException { diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java index bd575ae4d6..182b23ab87 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -3,334 +3,321 @@ 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("bv") @Implements("Actor") public abstract class Actor extends Entity { - @ObfuscatedName("el") - @ObfuscatedSignature( - signature = "Lku;" - ) - @Export("spriteIds") - static GraphicsDefaults spriteIds; - @ObfuscatedName("mh") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 1998357535 - ) - @Export("selectedSpellFlags") - static int selectedSpellFlags; - @ObfuscatedName("ai") - @ObfuscatedGetter( - intValue = 1951571129 + intValue = 274195699 ) @Export("x") int x; - @ObfuscatedName("ag") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -1702454117 + intValue = 1601699261 ) @Export("y") int y; - @ObfuscatedName("ao") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -1278261801 + intValue = -1309373011 ) @Export("rotation") int rotation; - @ObfuscatedName("aw") + @ObfuscatedName("ah") @Export("isWalking") boolean isWalking; - @ObfuscatedName("ak") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = 401053777 + intValue = 511883639 ) - int field938; - @ObfuscatedName("aa") + int field925; + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 1537825747 + intValue = -1397421297 ) @Export("playerCycle") int playerCycle; - @ObfuscatedName("ab") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = 1548693687 + intValue = -218556909 ) @Export("readySequence") int readySequence; @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 2043182385 + intValue = -1204927265 ) @Export("turnLeftSequence") int turnLeftSequence; - @ObfuscatedName("av") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = -1529323687 + intValue = -824766843 ) @Export("turnRightSequence") int turnRightSequence; - @ObfuscatedName("aq") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = -1702834689 + intValue = -1263337971 ) @Export("walkSequence") int walkSequence; - @ObfuscatedName("ac") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -1195328729 + intValue = -1033895093 ) @Export("walkBackSequence") int walkBackSequence; - @ObfuscatedName("az") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -551716323 + intValue = 1049050611 ) @Export("walkLeftSequence") int walkLeftSequence; - @ObfuscatedName("at") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -588172397 + intValue = -1372236963 ) @Export("walkRightSequence") int walkRightSequence; @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 1934964713 + intValue = -1324653627 ) @Export("runSequence") int runSequence; - @ObfuscatedName("aj") + @ObfuscatedName("ad") @Export("overheadText") String overheadText; - @ObfuscatedName("ap") + @ObfuscatedName("aj") @Export("isAutoChatting") boolean isAutoChatting; - @ObfuscatedName("an") - boolean field950; - @ObfuscatedName("al") + @ObfuscatedName("ax") + boolean field937; + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -2071391287 + intValue = -171465493 ) @Export("overheadTextCyclesRemaining") int overheadTextCyclesRemaining; - @ObfuscatedName("ay") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -1854297981 + intValue = -1280129029 ) @Export("overheadTextColor") int overheadTextColor; - @ObfuscatedName("ax") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -2046431957 + intValue = -373599431 ) @Export("overheadTextEffect") int overheadTextEffect; - @ObfuscatedName("as") + @ObfuscatedName("am") @Export("hitSplatCount") byte hitSplatCount; - @ObfuscatedName("ah") + @ObfuscatedName("ab") @Export("hitSplatTypes") int[] hitSplatTypes; - @ObfuscatedName("bi") + @ObfuscatedName("bj") @Export("hitSplatValues") int[] hitSplatValues; - @ObfuscatedName("bo") + @ObfuscatedName("bg") @Export("hitSplatCycles") int[] hitSplatCycles; - @ObfuscatedName("bx") + @ObfuscatedName("bw") @Export("hitSplatTypes2") int[] hitSplatTypes2; - @ObfuscatedName("bu") + @ObfuscatedName("bk") @Export("hitSplatValues2") int[] hitSplatValues2; - @ObfuscatedName("bd") + @ObfuscatedName("bl") @ObfuscatedSignature( - signature = "Ljm;" + signature = "Ljl;" ) @Export("healthBars") IterableNodeDeque healthBars; - @ObfuscatedName("bn") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = 2135432751 + intValue = -842697287 ) @Export("targetIndex") int targetIndex; - @ObfuscatedName("bj") + @ObfuscatedName("bx") @Export("false0") boolean false0; - @ObfuscatedName("bm") + @ObfuscatedName("bc") @ObfuscatedGetter( - intValue = 1522685125 + intValue = -2004895213 ) - int field965; - @ObfuscatedName("bq") + int field960; + @ObfuscatedName("by") @ObfuscatedGetter( - intValue = -1971794141 + intValue = -1753452087 ) @Export("movementSequence") int movementSequence; - @ObfuscatedName("bf") + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = -1163192511 + intValue = 25834883 ) @Export("movementFrame") int movementFrame; - @ObfuscatedName("by") + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = -705488337 + intValue = -143174307 ) @Export("movementFrameCycle") int movementFrameCycle; - @ObfuscatedName("br") + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = 980221 + intValue = 382239063 ) @Export("sequence") int sequence; - @ObfuscatedName("ba") + @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = 1531052871 + intValue = -226786267 ) @Export("sequenceFrame") int sequenceFrame; - @ObfuscatedName("bb") + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = 2086339795 + intValue = 175494277 ) @Export("sequenceFrameCycle") int sequenceFrameCycle; - @ObfuscatedName("bg") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = 863905413 + intValue = 62784213 ) @Export("sequenceDelay") int sequenceDelay; - @ObfuscatedName("bw") + @ObfuscatedName("bb") @ObfuscatedGetter( - intValue = -217068217 + intValue = 1890920221 ) - int field971; - @ObfuscatedName("be") + int field958; + @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = -1431332559 + intValue = 185005207 ) @Export("spotAnimation") int spotAnimation; - @ObfuscatedName("bt") + @ObfuscatedName("bv") @ObfuscatedGetter( - intValue = -446541561 + intValue = 1786856989 ) @Export("spotAnimationFrame") int spotAnimationFrame; - @ObfuscatedName("bl") + @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = -1428986091 + intValue = -327769151 ) @Export("spotAnimationFrameCycle") int spotAnimationFrameCycle; + @ObfuscatedName("be") + @ObfuscatedGetter( + intValue = -1796469609 + ) + int field943; + @ObfuscatedName("bd") + @ObfuscatedGetter( + intValue = 1623110031 + ) + int field963; + @ObfuscatedName("bf") + @ObfuscatedGetter( + intValue = -909355861 + ) + int field921; + @ObfuscatedName("bi") + @ObfuscatedGetter( + intValue = -1912574851 + ) + int field965; + @ObfuscatedName("br") + @ObfuscatedGetter( + intValue = 503419835 + ) + int field966; + @ObfuscatedName("bt") + @ObfuscatedGetter( + intValue = 625634807 + ) + int field929; @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = 1351668501 + intValue = -202999541 ) - int field975; - @ObfuscatedName("bv") + int field950; + @ObfuscatedName("co") @ObfuscatedGetter( - intValue = 639610433 + intValue = 1681195499 ) - int field996; - @ObfuscatedName("bs") + int field969; + @ObfuscatedName("cp") @ObfuscatedGetter( - intValue = 817107681 + intValue = 819823007 ) - int field946; - @ObfuscatedName("bz") - @ObfuscatedGetter( - intValue = 810384445 - ) - int field978; - @ObfuscatedName("bc") - @ObfuscatedGetter( - intValue = 40503997 - ) - int field979; - @ObfuscatedName("bh") - @ObfuscatedGetter( - intValue = 1623463931 - ) - int field980; - @ObfuscatedName("bk") - @ObfuscatedGetter( - intValue = -950690973 - ) - int field934; - @ObfuscatedName("cm") - @ObfuscatedGetter( - intValue = 1712532071 - ) - int field982; + int field970; @ObfuscatedName("cd") @ObfuscatedGetter( - intValue = 1620214811 - ) - int field983; - @ObfuscatedName("cv") - @ObfuscatedGetter( - intValue = 1481734065 + intValue = 1293515615 ) @Export("npcCycle") int npcCycle; - @ObfuscatedName("cl") + @ObfuscatedName("cj") @ObfuscatedGetter( - intValue = 1455392247 + intValue = -958995757 ) @Export("defaultHeight") int defaultHeight; - @ObfuscatedName("cg") + @ObfuscatedName("cq") @ObfuscatedGetter( - intValue = -27617279 + intValue = -839837513 ) @Export("orientation") int orientation; - @ObfuscatedName("ch") + @ObfuscatedName("cb") @ObfuscatedGetter( - intValue = 1781093081 + intValue = -1474803963 ) - int field987; - @ObfuscatedName("co") + int field974; + @ObfuscatedName("cf") @ObfuscatedGetter( - intValue = 860658493 + intValue = 1709100513 ) - int field988; - @ObfuscatedName("cr") + int field968; + @ObfuscatedName("cs") @ObfuscatedGetter( - intValue = 469579589 + intValue = 905332161 ) @Export("pathLength") int pathLength; - @ObfuscatedName("ck") + @ObfuscatedName("ch") @Export("pathX") int[] pathX; - @ObfuscatedName("cb") + @ObfuscatedName("ca") @Export("pathY") int[] pathY; - @ObfuscatedName("cy") + @ObfuscatedName("cn") @Export("pathTraversed") byte[] pathTraversed; - @ObfuscatedName("cn") + @ObfuscatedName("cx") @ObfuscatedGetter( - intValue = 1598784809 + intValue = 426432369 ) - int field976; - @ObfuscatedName("cj") + int field980; + @ObfuscatedName("ck") @ObfuscatedGetter( - intValue = 559009223 + intValue = -1929716187 ) - int field994; + int field926; Actor() { this.isWalking = false; - this.field938 = 1; + this.field925 = 1; this.readySequence = -1; this.turnLeftSequence = -1; this.turnRightSequence = -1; @@ -340,7 +327,7 @@ public abstract class Actor extends Entity { this.walkRightSequence = -1; this.runSequence = -1; this.overheadText = null; - this.field950 = false; + this.field937 = false; this.overheadTextCyclesRemaining = 100; this.overheadTextColor = 0; this.overheadTextEffect = 0; @@ -353,7 +340,7 @@ public abstract class Actor extends Entity { this.healthBars = new IterableNodeDeque(); this.targetIndex = -1; this.false0 = false; - this.field965 = -1; + this.field960 = -1; this.movementSequence = -1; this.movementFrame = 0; this.movementFrameCycle = 0; @@ -361,46 +348,46 @@ public abstract class Actor extends Entity { this.sequenceFrame = 0; this.sequenceFrameCycle = 0; this.sequenceDelay = 0; - this.field971 = 0; + this.field958 = 0; this.spotAnimation = -1; this.spotAnimationFrame = 0; this.spotAnimationFrameCycle = 0; this.npcCycle = 0; this.defaultHeight = 200; - this.field987 = 0; - this.field988 = 32; + this.field974 = 0; + this.field968 = 32; this.pathLength = 0; this.pathX = new int[10]; this.pathY = new int[10]; this.pathTraversed = new byte[10]; - this.field976 = 0; - this.field994 = 0; + this.field980 = 0; + this.field926 = 0; } - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-968027489" + signature = "(S)Z", + garbageValue = "3163" ) @Export("isVisible") boolean isVisible() { return false; } - @ObfuscatedName("au") + @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-2082426618" + signature = "(B)V", + garbageValue = "-52" ) - final void method1759() { + final void method1742() { this.pathLength = 0; - this.field994 = 0; + this.field926 = 0; } - @ObfuscatedName("as") + @ObfuscatedName("am") @ObfuscatedSignature( signature = "(IIIIIII)V", - garbageValue = "-666824571" + garbageValue = "2136221861" ) @Export("addHitSplat") final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) { @@ -420,9 +407,9 @@ public abstract class Actor extends Entity { int var10 = -1; int var11 = 0; if (var1 >= 0) { - HitSplatDefinition var12 = class42.method811(var1); - var10 = var12.field3347; - var11 = var12.field3338; + HitSplatDefinition var12 = MusicPatchNode.method3815(var1); + var10 = var12.field3299; + var11 = var12.field3298; } int var14; @@ -478,76 +465,61 @@ public abstract class Actor extends Entity { } } - @ObfuscatedName("ah") + @ObfuscatedName("ab") @ObfuscatedSignature( signature = "(IIIIIII)V", - garbageValue = "1706369606" + garbageValue = "1083208214" ) @Export("addHealthBar") final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) { - HealthBarDefinition var8 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1); - HealthBarDefinition var7; - if (var8 != null) { - var7 = var8; - } else { - byte[] var9 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var1); - var8 = new HealthBarDefinition(); - if (var9 != null) { - var8.decode(new Buffer(var9)); - } + HealthBarDefinition var7 = class32.method548(var1); + HealthBar var8 = null; + HealthBar var9 = null; + int var10 = var7.int2; + int var11 = 0; - HealthBarDefinition.HealthBarDefinition_cached.put(var8, (long)var1); - var7 = var8; - } - - var8 = var7; - HealthBar var14 = null; - HealthBar var10 = null; - int var11 = var7.int2; - int var12 = 0; - - HealthBar var13; - for (var13 = (HealthBar)this.healthBars.last(); var13 != null; var13 = (HealthBar)this.healthBars.previous()) { - ++var12; - if (var13.definition.field3294 == var8.field3294) { - var13.put(var2 + var4, var5, var6, var3); + HealthBar var12; + for (var12 = (HealthBar)this.healthBars.last(); var12 != null; var12 = (HealthBar)this.healthBars.previous()) { + ++var11; + if (var12.definition.field3249 == var7.field3249) { + var12.put(var2 + var4, var5, var6, var3); return; } - if (var13.definition.int1 <= var8.int1) { - var14 = var13; + if (var12.definition.int1 <= var7.int1) { + var8 = var12; } - if (var13.definition.int2 > var11) { - var10 = var13; - var11 = var13.definition.int2; + if (var12.definition.int2 > var10) { + var9 = var12; + var10 = var12.definition.int2; } } - if (var10 != null || var12 < 4) { - var13 = new HealthBar(var8); - if (var14 == null) { - this.healthBars.addLast(var13); + if (var9 != null || var11 < 4) { + var12 = new HealthBar(var7); + if (var8 == null) { + this.healthBars.addLast(var12); } else { - IterableNodeDeque.IterableNodeDeque_addBefore(var13, var14); + IterableNodeDeque.IterableNodeDeque_addBefore(var12, var8); } - var13.put(var2 + var4, var5, var6, var3); - if (var12 >= 4) { - var10.remove(); + var12.put(var2 + var4, var5, var6, var3); + if (var11 >= 4) { + var9.remove(); } } } - @ObfuscatedName("bi") + @ObfuscatedName("bj") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-1031768324" + garbageValue = "-982043878" ) @Export("removeHealthBar") final void removeHealthBar(int var1) { - HealthBarDefinition var2 = class42.method810(var1); + HealthBarDefinition var2 = class32.method548(var1); for (HealthBar var3 = (HealthBar)this.healthBars.last(); var3 != null; var3 = (HealthBar)this.healthBars.previous()) { if (var2 == var3.definition) { @@ -558,194 +530,38 @@ public abstract class Actor extends Entity { } - @ObfuscatedName("u") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;I)J", - garbageValue = "1807317311" + signature = "(S)V", + garbageValue = "277" ) - static long method1773(CharSequence var0) { - long var1 = 0L; - int var3 = var0.length(); - - for (int var4 = 0; var4 < var3; ++var4) { - var1 *= 37L; - char var5 = var0.charAt(var4); - if (var5 >= 'A' && var5 <= 'Z') { - var1 += (long)(var5 + 1 - 65); - } else if (var5 >= 'a' && var5 <= 'z') { - var1 += (long)(var5 + 1 - 97); - } else if (var5 >= '0' && var5 <= '9') { - var1 += (long)(var5 + 27 - 48); - } - - if (var1 >= 177917621779460413L) { - break; - } - } - - while (0L == var1 % 37L && 0L != var1) { - var1 /= 37L; - } - - return var1; + public static void method1755() { + GZipDecompressor.midiPcmStream.clear(); + class197.field2392 = 1; + Coord.musicTrackArchive = null; } - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(ILci;ZB)I", - garbageValue = "-13" + signature = "(I)V", + garbageValue = "540632011" ) - static int method1774(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var3 = Language.getWidget(Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]); - } else { - var3 = var2 ? Interpreter.field1090 : class188.field2352; - } - - if (var0 == ScriptOpcodes.CC_CALLONRESIZE) { - if (Interpreter.field1095 >= 10) { - throw new RuntimeException(); - } else if (var3.onResize == null) { - return 0; - } else { - ScriptEvent var4 = new ScriptEvent(); - var4.widget = var3; - var4.args = var3.onResize; - var4.field577 = Interpreter.field1095 + 1; - Client.scriptEvents.addFirst(var4); - return 1; - } - } else { - return 2; - } + public static void method1756() { + VarpDefinition.VarpDefinition_cached.clear(); } - @ObfuscatedName("hs") + @ObfuscatedName("ih") @ObfuscatedSignature( - signature = "(IIIIIIIB)V", - garbageValue = "-99" + signature = "(I)V", + garbageValue = "276036566" ) - @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 != ClientPacket.Client_plane) { - return; - } - - long var7 = 0L; - boolean var9 = true; - boolean var10 = false; - boolean var11 = false; - if (var1 == 0) { - var7 = class2.scene.getBoundaryObjectTag(var0, var2, var3); - } - - if (var1 == 1) { - var7 = class2.scene.getWallDecorationTag(var0, var2, var3); - } - - if (var1 == 2) { - var7 = class2.scene.getGameObjectTag(var0, var2, var3); - } - - if (var1 == 3) { - var7 = class2.scene.getFloorDecorationTag(var0, var2, var3); - } - - int var12; - if (var7 != 0L) { - var12 = class2.scene.getObjectFlags(var0, var2, var3, var7); - int var14 = ItemContainer.Entity_unpackID(var7); - int var15 = var12 & 31; - int var16 = var12 >> 6 & 3; - ObjectDefinition var13; - if (var1 == 0) { - class2.scene.removeBoundaryObject(var0, var2, var3); - var13 = Occluder.getObjectDefinition(var14); - if (var13.interactType != 0) { - Client.collisionMaps[var0].method3598(var2, var3, var15, var16, var13.boolean1); - } - } - - if (var1 == 1) { - class2.scene.removeWallDecoration(var0, var2, var3); - } - - if (var1 == 2) { - class2.scene.removeGameObject(var0, var2, var3); - var13 = Occluder.getObjectDefinition(var14); - if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { - return; - } - - if (var13.interactType != 0) { - Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var16, var13.boolean1); - } - } - - if (var1 == 3) { - class2.scene.removeFloorDecoration(var0, var2, var3); - var13 = Occluder.getObjectDefinition(var14); - if (var13.interactType == 1) { - Client.collisionMaps[var0].method3601(var2, var3); - } - } - } - - if (var4 >= 0) { - var12 = var0; - if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { - var12 = var0 + 1; - } - - MenuAction.method2088(var0, var12, var2, var3, var4, var5, var6, class2.scene, Client.collisionMaps[var0]); - } - } - - } - - @ObfuscatedName("im") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "0" - ) - @Export("Widget_runOnTargetLeave") - static void Widget_runOnTargetLeave() { - if (Client.isSpellSelected) { - Widget var0 = UserComparator3.getWidgetChild(WorldMapAreaData.selectedSpellWidget, Client.selectedSpellChildIndex); - if (var0 != null && var0.onTargetLeave != null) { - ScriptEvent var1 = new ScriptEvent(); - var1.widget = var0; - var1.args = var0.onTargetLeave; - WorldMapLabel.runScriptEvent(var1); - } - - Client.isSpellSelected = false; - ScriptEvent.invalidateWidget(var0); - } - } - - @ObfuscatedName("jg") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "3" - ) - static final void method1756() { - PacketBufferNode var0 = ModelData0.getPacketBufferNode(ClientPacket.field2311, 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) { - class43.closeInterface(var1, true); - } - } - - if (Client.meslayerContinueWidget != null) { - ScriptEvent.invalidateWidget(Client.meslayerContinueWidget); - Client.meslayerContinueWidget = null; - } - + @Export("addCancelMenuEntry") + static void addCancelMenuEntry() { + WorldMapData_1.method708(); + Client.menuActions[0] = "Cancel"; + Client.menuTargets[0] = ""; + Client.menuOpcodes[0] = 1006; + Client.menuShiftClick[0] = false; + Client.menuOptionsCount = 1; } } diff --git a/runescape-client/src/main/java/Animation.java b/runescape-client/src/main/java/Animation.java index c46c916f09..4d77a4bd7a 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("dg") +@ObfuscatedName("dj") @Implements("Animation") public class Animation { - @ObfuscatedName("u") - static int[] field1634; @ObfuscatedName("f") - static int[] field1626; - @ObfuscatedName("b") - static int[] field1627; - @ObfuscatedName("g") - static int[] field1631; - @ObfuscatedName("z") + static int[] field1615; + @ObfuscatedName("i") + static int[] field1614; + @ObfuscatedName("y") + static int[] field1611; + @ObfuscatedName("w") + static int[] field1616; + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lec;" + signature = "Lek;" ) @Export("skeleton") Skeleton skeleton; - @ObfuscatedName("p") + @ObfuscatedName("b") @Export("transformCount") int transformCount; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("transformSkeletonLabels") int[] transformSkeletonLabels; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("transformXs") int[] transformXs; - @ObfuscatedName("w") + @ObfuscatedName("a") @Export("transformYs") int[] transformYs; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("transformZs") int[] transformZs; - @ObfuscatedName("k") + @ObfuscatedName("c") @Export("hasAlphaTransform") boolean hasAlphaTransform; static { - field1634 = new int[500]; - field1626 = new int[500]; - field1627 = new int[500]; - field1631 = new int[500]; + field1615 = new int[500]; + field1614 = new int[500]; + field1611 = new int[500]; + field1616 = new int[500]; } @ObfuscatedSignature( - signature = "([BLec;)V" + signature = "([BLek;)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) { - field1634[var7] = var10; - field1626[var7] = 0; - field1627[var7] = 0; - field1631[var7] = 0; + field1615[var7] = var10; + field1614[var7] = 0; + field1611[var7] = 0; + field1616[var7] = 0; ++var7; break; } } } - field1634[var7] = var8; + field1615[var7] = var8; short var11 = 0; if (this.skeleton.transformTypes[var8] == 3) { var11 = 128; } if ((var9 & 1) != 0) { - field1626[var7] = var4.readShortSmart(); + field1614[var7] = var4.readShortSmart(); } else { - field1626[var7] = var11; + field1614[var7] = var11; } if ((var9 & 2) != 0) { - field1627[var7] = var4.readShortSmart(); + field1611[var7] = var4.readShortSmart(); } else { - field1627[var7] = var11; + field1611[var7] = var11; } if ((var9 & 4) != 0) { - field1631[var7] = var4.readShortSmart(); + field1616[var7] = var4.readShortSmart(); } else { - field1631[var7] = var11; + field1616[var7] = var11; } var6 = var8; @@ -121,10 +121,10 @@ public class Animation { this.transformZs = new int[var7]; for (var8 = 0; var8 < var7; ++var8) { - this.transformSkeletonLabels[var8] = field1634[var8]; - this.transformXs[var8] = field1626[var8]; - this.transformYs[var8] = field1627[var8]; - this.transformZs[var8] = field1631[var8]; + this.transformSkeletonLabels[var8] = field1615[var8]; + this.transformXs[var8] = field1614[var8]; + this.transformYs[var8] = field1611[var8]; + this.transformZs[var8] = field1616[var8]; } } diff --git a/runescape-client/src/main/java/Archive.java b/runescape-client/src/main/java/Archive.java index c7d0e702a5..201e7f79c3 100644 --- a/runescape-client/src/main/java/Archive.java +++ b/runescape-client/src/main/java/Archive.java @@ -5,78 +5,78 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ij") +@ObfuscatedName("if") @Implements("Archive") public class Archive extends AbstractArchive { - @ObfuscatedName("am") + @ObfuscatedName("aw") @Export("Archive_crc") static CRC32 Archive_crc; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lke;" + signature = "Lkg;" ) @Export("archiveDisk") ArchiveDisk archiveDisk; - @ObfuscatedName("q") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lke;" + signature = "Lkg;" ) @Export("masterDisk") ArchiveDisk masterDisk; - @ObfuscatedName("l") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -485019115 + intValue = -1842467633 ) @Export("index") int index; - @ObfuscatedName("j") - volatile boolean field3158; - @ObfuscatedName("af") - boolean field3163; - @ObfuscatedName("ad") + @ObfuscatedName("q") + volatile boolean field3130; + @ObfuscatedName("aa") + boolean field3131; + @ObfuscatedName("av") @Export("validGroups") volatile boolean[] validGroups; - @ObfuscatedName("ai") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -811032565 + intValue = -1109025613 ) @Export("indexCrc") int indexCrc; - @ObfuscatedName("ag") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -714735647 + intValue = -1689263625 ) @Export("indexVersion") int indexVersion; - @ObfuscatedName("ao") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -1499508755 + intValue = 756827345 ) - int field3168; + int field3128; static { Archive_crc = new CRC32(); } @ObfuscatedSignature( - signature = "(Lke;Lke;IZZZ)V" + signature = "(Lkg;Lkg;IZZZ)V" ) public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) { super(var4, var5); - this.field3158 = false; - this.field3163 = false; - this.field3168 = -1; + this.field3130 = false; + this.field3131 = false; + this.field3128 = -1; this.archiveDisk = var1; this.masterDisk = var2; this.index = var3; - this.field3163 = var6; - WorldMapIcon_0.method224(this, this.index); + this.field3131 = var6; + class48.method862(this, this.index); } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-64779180" + garbageValue = "236985177" ) @Export("loadRegionFromGroup") void loadRegionFromGroup(int var1) { @@ -89,116 +89,96 @@ public class Archive extends AbstractArchive { } - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-1387572162" + signature = "(IS)I", + garbageValue = "6161" ) @Export("groupLoadPercent") int groupLoadPercent(int var1) { if (super.groups[var1] != null) { return 100; - } else if (this.validGroups[var1]) { - return 100; } else { - int var3 = this.index; - long var4 = (long)((var3 << 16) + var1); - int var2; - if (NetCache.NetCache_currentResponse != null && NetCache.NetCache_currentResponse.key == var4) { - var2 = class32.NetCache_responseArchiveBuffer.offset * 99 / (class32.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding) + 1; - } else { - var2 = 0; - } - - return var2; + return this.validGroups[var1] ? 100 : Clock.method3489(this.index, var1); } } - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "130067407" + garbageValue = "1606315041" ) @Export("loadGroup") void loadGroup(int var1) { if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) { - PlayerType.method4210(var1, this.archiveDisk, this); + class30.method543(var1, this.archiveDisk, this); } else { - ClientPreferences.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); + class226.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); } } - @ObfuscatedName("dw") - @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "0" - ) - public boolean method4345() { - return this.field3158; - } - @ObfuscatedName("de") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-77" + signature = "(B)Z", + garbageValue = "-47" + ) + public boolean method4246() { + return this.field3130; + } + + @ObfuscatedName("df") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "1662836587" ) @Export("percentage") public int percentage() { - if (this.field3158) { + if (this.field3130) { return 100; } else if (super.groups != null) { return 99; } else { - int var2 = this.index; - long var3 = (long)(var2 + 16711680); - int var1; - if (NetCache.NetCache_currentResponse != null && NetCache.NetCache_currentResponse.key == var3) { - var1 = class32.NetCache_responseArchiveBuffer.offset * 99 / (class32.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding) + 1; - } else { - var1 = 0; - } - - int var5 = var1; + int var1 = Clock.method3489(255, this.index); if (var1 >= 100) { - var5 = 99; + var1 = 99; } - return var5; + return var1; } } - @ObfuscatedName("dx") + @ObfuscatedName("di") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "-1360359241" + garbageValue = "-190190944" ) @Export("loadIndex") - void loadIndex(int var1, int var2) { + public void loadIndex(int var1, int var2) { this.indexCrc = var1; this.indexVersion = var2; if (this.masterDisk != null) { - PlayerType.method4210(this.index, this.masterDisk, this); + class30.method543(this.index, this.masterDisk, this); } else { - ClientPreferences.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); + class226.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); } } - @ObfuscatedName("dc") + @ObfuscatedName("dr") @ObfuscatedSignature( signature = "(I[BZZI)V", - garbageValue = "1341522635" + garbageValue = "-1214934891" ) @Export("write") - void write(int var1, byte[] var2, boolean var3, boolean var4) { + public void write(int var1, byte[] var2, boolean var3, boolean var4) { if (var3) { - if (this.field3158) { + if (this.field3130) { throw new RuntimeException(); } if (this.masterDisk != null) { - TileItem.method2144(this.index, var2, this.masterDisk); + ByteArrayPool.method5805(this.index, var2, this.masterDisk); } this.decodeIndex(var2); @@ -207,7 +187,7 @@ public class Archive extends AbstractArchive { var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8); var2[var2.length - 1] = (byte)super.groupVersions[var1]; if (this.archiveDisk != null) { - TileItem.method2144(var1, var2, this.archiveDisk); + ByteArrayPool.method5805(var1, var2, this.archiveDisk); this.validGroups[var1] = true; } @@ -230,21 +210,21 @@ public class Archive extends AbstractArchive { } - @ObfuscatedName("dk") + @ObfuscatedName("dg") @ObfuscatedSignature( - signature = "(Lke;I[BZB)V", - garbageValue = "45" + signature = "(Lkg;I[BZI)V", + garbageValue = "-1566911980" ) @Export("load") void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { int var5; if (var1 == this.masterDisk) { - if (this.field3158) { + if (this.field3130) { throw new RuntimeException(); } if (var3 == null) { - ClientPreferences.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); + class226.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); return; } @@ -252,11 +232,11 @@ public class Archive extends AbstractArchive { Archive_crc.update(var3, 0, var3.length); var5 = (int)Archive_crc.getValue(); if (var5 != this.indexCrc) { - ClientPreferences.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); + class226.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); return; } - Buffer var11 = new Buffer(class226.decompressBytes(var3)); + Buffer var11 = new Buffer(Skills.decompressBytes(var3)); int var12 = var11.readUnsignedByte(); if (var12 != 5 && var12 != 6) { throw new RuntimeException(var12 + "," + this.index + "," + var2); @@ -268,21 +248,21 @@ public class Archive extends AbstractArchive { } if (var8 != this.indexVersion) { - ClientPreferences.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); + class226.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); return; } this.decodeIndex(var3); this.loadAllLocal(); } else { - if (!var4 && var2 == this.field3168) { - this.field3158 = true; + if (!var4 && var2 == this.field3128) { + this.field3130 = true; } if (var3 == null || var3.length <= 2) { this.validGroups[var2] = false; - if (this.field3163 || var4) { - ClientPreferences.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + if (this.field3131 || var4) { + class226.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } return; @@ -294,8 +274,8 @@ public class Archive extends AbstractArchive { int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); if (var5 != super.groupCrcs[var2] || var6 != super.groupVersions[var2]) { this.validGroups[var2] = false; - if (this.field3163 || var4) { - ClientPreferences.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + if (this.field3131 || var4) { + class226.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } return; @@ -321,10 +301,10 @@ public class Archive extends AbstractArchive { } - @ObfuscatedName("dj") + @ObfuscatedName("dh") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1169710133" + garbageValue = "-1822102759" ) @Export("loadAllLocal") void loadAllLocal() { @@ -336,46 +316,46 @@ public class Archive extends AbstractArchive { } if (this.archiveDisk == null) { - this.field3158 = true; + this.field3130 = true; } else { - this.field3168 = -1; + this.field3128 = -1; for (var1 = 0; var1 < this.validGroups.length; ++var1) { if (super.fileCounts[var1] > 0) { - class40.method780(var1, this.archiveDisk, this); - this.field3168 = var1; + WorldMapLabelSize.method186(var1, this.archiveDisk, this); + this.field3128 = var1; } } - if (this.field3168 == -1) { - this.field3158 = true; + if (this.field3128 == -1) { + this.field3130 = true; } } } - @ObfuscatedName("dp") + @ObfuscatedName("dl") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "2065580050" + garbageValue = "1057662007" ) - public boolean method4354(int var1) { + public boolean method4266(int var1) { return this.validGroups[var1]; } - @ObfuscatedName("di") + @ObfuscatedName("da") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "581589057" + garbageValue = "693879570" ) - public boolean method4355(int var1) { + public boolean method4275(int var1) { return this.getGroupFileIds(var1) != null; } - @ObfuscatedName("dn") + @ObfuscatedName("dp") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1792861334" + garbageValue = "-576778169" ) @Export("loadPercent") public int loadPercent() { @@ -397,4 +377,34 @@ public class Archive extends AbstractArchive { return var3; } } + + @ObfuscatedName("gh") + @ObfuscatedSignature( + signature = "(ZB)V", + garbageValue = "0" + ) + @Export("addNpcsToScene") + static final void addNpcsToScene(boolean var0) { + for (int var1 = 0; var1 < Client.npcCount; ++var1) { + NPC var2 = Client.npcs[Client.npcIndices[var1]]; + if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { + int var3 = var2.x >> 7; + int var4 = var2.y >> 7; + if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { + if (var2.field925 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { + if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { + continue; + } + + Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; + } + + long var5 = KeyHandler.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); + var2.playerCycle = Client.cycle; + class14.scene.drawEntity(UrlRequest.Client_plane, var2.x, var2.y, ScriptEvent.getTileHeight(var2.field925 * 64 - 64 + var2.x, var2.field925 * 64 - 64 + var2.y, UrlRequest.Client_plane), var2.field925 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); + } + } + } + + } } diff --git a/runescape-client/src/main/java/ArchiveDisk.java b/runescape-client/src/main/java/ArchiveDisk.java index 119d80c4c1..756d0d3c05 100644 --- a/runescape-client/src/main/java/ArchiveDisk.java +++ b/runescape-client/src/main/java/ArchiveDisk.java @@ -6,33 +6,33 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ke") +@ObfuscatedName("kg") @Implements("ArchiveDisk") public final class ArchiveDisk { - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("ArchiveDisk_buffer") static byte[] ArchiveDisk_buffer; - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "Lmb;" - ) - @Export("datFile") - BufferedFile datFile; - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "Lmb;" - ) - @Export("idxFile") - BufferedFile idxFile; - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 417377451 + intValue = 77454403 ) @Export("archive") int archive; - @ObfuscatedName("z") + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "Lmy;" + ) + @Export("datFile") + BufferedFile datFile; + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "Lmy;" + ) + @Export("idxFile") + BufferedFile idxFile; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1640009955 + intValue = 1304769843 ) @Export("maxEntrySize") int maxEntrySize; @@ -42,7 +42,7 @@ public final class ArchiveDisk { } @ObfuscatedSignature( - signature = "(ILmb;Lmb;I)V" + signature = "(ILmy;Lmy;I)V" ) public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) { this.datFile = null; @@ -54,10 +54,10 @@ public final class ArchiveDisk { this.maxEntrySize = var4; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(II)[B", - garbageValue = "-2146892586" + signature = "(IB)[B", + garbageValue = "-19" ) @Export("read") public byte[] read(int var1) { @@ -112,14 +112,14 @@ public final class ArchiveDisk { } var13 = 8; - this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13); + 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; } - if (var9 != var1 || var10 != var7 || var12 != this.archive) { + if (var9 != var1 || var7 != var10 || var12 != this.archive) { var10000 = null; return (byte[])var10000; } @@ -129,7 +129,7 @@ public final class ArchiveDisk { return (byte[])var10000; } - int var14 = var8 + var13; + int var14 = var13 + var8; for (int var15 = var13; var15 < var14; ++var15) { var5[var6++] = ArchiveDisk_buffer[var15]; @@ -148,10 +148,10 @@ public final class ArchiveDisk { } } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(I[BII)Z", - garbageValue = "-847322953" + garbageValue = "1696997019" ) @Export("write") public boolean write(int var1, byte[] var2, int var3) { @@ -169,10 +169,10 @@ public final class ArchiveDisk { } } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(I[BIZB)Z", - garbageValue = "127" + signature = "(I[BIZI)Z", + garbageValue = "957483155" ) @Export("write0") boolean write0(int var1, byte[] var2, int var3, boolean var4) { @@ -217,7 +217,7 @@ public final class ArchiveDisk { int var9 = 0; int var10; if (var4) { - this.datFile.seek(520L * (long)var6); + this.datFile.seek((long)var6 * 520L); int var11; int var12; if (var1 > 65535) { @@ -262,7 +262,7 @@ public final class ArchiveDisk { ++var9; } - if (var6 == var9) { + if (var9 == var6) { ++var9; } } @@ -282,7 +282,7 @@ public final class ArchiveDisk { ArchiveDisk_buffer[7] = (byte)(var9 >> 8); ArchiveDisk_buffer[8] = (byte)var9; ArchiveDisk_buffer[9] = (byte)this.archive; - this.datFile.seek(520L * (long)var6); + this.datFile.seek((long)var6 * 520L); this.datFile.write(ArchiveDisk_buffer, 0, 10); var10 = var3 - var7; if (var10 > 510) { @@ -304,7 +304,7 @@ public final class ArchiveDisk { ArchiveDisk_buffer[5] = (byte)(var9 >> 8); ArchiveDisk_buffer[6] = (byte)var9; ArchiveDisk_buffer[7] = (byte)this.archive; - this.datFile.seek(520L * (long)var6); + this.datFile.seek((long)var6 * 520L); this.datFile.write(ArchiveDisk_buffer, 0, 8); var10 = var3 - var7; if (var10 > 512) { @@ -333,4 +333,24 @@ public final class ArchiveDisk { public String toString() { return "" + this.archive; } + + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "(I)[Lcf;", + garbageValue = "2092727218" + ) + static AttackOption[] method5908() { + return new AttackOption[]{AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_hidden, AttackOption.AttackOption_alwaysRightClick}; + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "(Lhz;Lhz;Ljava/lang/String;Ljava/lang/String;I)Lko;", + garbageValue = "-378013703" + ) + public static Font method5909(AbstractArchive var0, AbstractArchive var1, String var2, String var3) { + int var4 = var0.getGroupId(var2); + int var5 = var0.getFileId(var4, var3); + return class14.method160(var0, var1, var4, var5); + } } diff --git a/runescape-client/src/main/java/ArchiveDiskAction.java b/runescape-client/src/main/java/ArchiveDiskAction.java index 36fa6a6825..de149d6088 100644 --- a/runescape-client/src/main/java/ArchiveDiskAction.java +++ b/runescape-client/src/main/java/ArchiveDiskAction.java @@ -1,30 +1,31 @@ +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("ho") +@ObfuscatedName("hr") @Implements("ArchiveDiskAction") public class ArchiveDiskAction extends Node { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 168002015 + intValue = -867682367 ) @Export("type") int type; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("data") byte[] data; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lke;" + signature = "Lkg;" ) @Export("archiveDisk") ArchiveDisk archiveDisk; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lij;" + signature = "Lif;" ) @Export("archive") Archive archive; @@ -32,29 +33,14 @@ public class ArchiveDiskAction extends Node { ArchiveDiskAction() { } - @ObfuscatedName("f") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "([BILjava/lang/CharSequence;I)I", - garbageValue = "-1806066306" + signature = "(Ljava/awt/Component;I)V", + garbageValue = "2084975828" ) - public static int method4229(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 & '?'); - } - } - - return var4 - var1; + static void method4120(Component var0) { + var0.removeKeyListener(KeyHandler.KeyHandler_instance); + var0.removeFocusListener(KeyHandler.KeyHandler_instance); + KeyHandler.field373 = -1; } } diff --git a/runescape-client/src/main/java/ArchiveDiskActionHandler.java b/runescape-client/src/main/java/ArchiveDiskActionHandler.java index b8238bfa09..7eed8ae045 100644 --- a/runescape-client/src/main/java/ArchiveDiskActionHandler.java +++ b/runescape-client/src/main/java/ArchiveDiskActionHandler.java @@ -4,37 +4,37 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ic") +@ObfuscatedName("ih") @Implements("ArchiveDiskActionHandler") public class ArchiveDiskActionHandler implements Runnable { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Ljd;" + signature = "Ljs;" ) @Export("ArchiveDiskActionHandler_requestQueue") static NodeDeque ArchiveDiskActionHandler_requestQueue; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Ljd;" + signature = "Ljs;" ) @Export("ArchiveDiskActionHandler_responseQueue") static NodeDeque ArchiveDiskActionHandler_responseQueue; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1217750145 + intValue = 509614069 ) - public static int field3155; - @ObfuscatedName("g") + static int field3120; + @ObfuscatedName("w") @Export("ArchiveDiskActionHandler_lock") - public static Object ArchiveDiskActionHandler_lock; - @ObfuscatedName("z") + static Object ArchiveDiskActionHandler_lock; + @ObfuscatedName("p") @Export("ArchiveDiskActionHandler_thread") static Thread ArchiveDiskActionHandler_thread; static { ArchiveDiskActionHandler_requestQueue = new NodeDeque(); ArchiveDiskActionHandler_responseQueue = new NodeDeque(); - field3155 = 0; + field3120 = 0; ArchiveDiskActionHandler_lock = new Object(); } @@ -63,162 +63,39 @@ public class ArchiveDiskActionHandler implements Runnable { } synchronized(ArchiveDiskActionHandler_lock) { - if (field3155 <= 1) { - field3155 = 0; + if (field3120 <= 1) { + field3120 = 0; ArchiveDiskActionHandler_lock.notifyAll(); return; } - field3155 = 600; + field3120 = 600; } } else { - long var8 = 99L; - - try { - Thread.sleep(var8); - } catch (InterruptedException var15) { - } - - try { - Thread.sleep(1L); - } catch (InterruptedException var14) { - } - + ServerBuild.method4111(100L); synchronized(ArchiveDiskActionHandler_lock) { - if (field3155 <= 1) { - field3155 = 0; + if (field3120 <= 1) { + field3120 = 0; ArchiveDiskActionHandler_lock.notifyAll(); return; } - --field3155; + --field3120; } } } - } catch (Exception var17) { - Calendar.RunException_sendStackTrace((String)null, var17); + } catch (Exception var13) { + DesktopPlatformInfoProvider.RunException_sendStackTrace((String)null, var13); } } - @ObfuscatedName("u") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lgc;I)I", - garbageValue = "-1277174237" + signature = "(Ljava/lang/CharSequence;I)I", + garbageValue = "139365615" ) - @Export("compareStrings") - public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) { - int var3 = var0.length(); - int var4 = var1.length(); - int var5 = 0; - int var6 = 0; - byte var7 = 0; - byte var8 = 0; - - while (var5 - var7 < var3 || var6 - var8 < var4) { - if (var5 - var7 >= var3) { - return -1; - } - - if (var6 - var8 >= var4) { - return 1; - } - - char var9; - if (var7 != 0) { - var9 = (char)var7; - boolean var14 = false; - } else { - var9 = var0.charAt(var5++); - } - - char var10; - if (var8 != 0) { - var10 = (char)var8; - boolean var15 = false; - } else { - var10 = var1.charAt(var6++); - } - - byte var11; - if (var9 == 198) { - var11 = 69; - } else if (var9 == 230) { - var11 = 101; - } else if (var9 == 223) { - var11 = 115; - } else if (var9 == 338) { - var11 = 69; - } else if (var9 == 339) { - var11 = 101; - } else { - var11 = 0; - } - - var7 = var11; - byte var12; - if (var10 == 198) { - var12 = 69; - } else if (var10 == 230) { - var12 = 101; - } else if (var10 == 223) { - var12 = 115; - } else if (var10 == 338) { - var12 = 69; - } else if (var10 == 339) { - var12 = 101; - } else { - var12 = 0; - } - - var8 = var12; - var9 = PacketWriter.standardizeChar(var9, var2); - var10 = PacketWriter.standardizeChar(var10, var2); - if (var10 != var9 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { - var9 = Character.toLowerCase(var9); - var10 = Character.toLowerCase(var10); - if (var9 != var10) { - return StudioGame.lowercaseChar(var9, var2) - StudioGame.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 (var18 != var20 && Character.toUpperCase(var18) != Character.toUpperCase(var20)) { - var18 = Character.toLowerCase(var18); - var20 = Character.toLowerCase(var20); - if (var20 != var18) { - return StudioGame.lowercaseChar(var18, var2) - StudioGame.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 (var20 != var13) { - return StudioGame.lowercaseChar(var20, var2) - StudioGame.lowercaseChar(var13, var2); - } - } - - return 0; - } + @Export("parseInt") + public static int parseInt(CharSequence var0) { + return TriBool.parseIntCustomRadix(var0, 10, true); } } diff --git a/runescape-client/src/main/java/ArchiveLoader.java b/runescape-client/src/main/java/ArchiveLoader.java index e4480b978c..f8446a87ab 100644 --- a/runescape-client/src/main/java/ArchiveLoader.java +++ b/runescape-client/src/main/java/ArchiveLoader.java @@ -1,38 +1,39 @@ +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("bj") +@ObfuscatedName("bx") @Implements("ArchiveLoader") public class ArchiveLoader { - @ObfuscatedName("y") - public static short[][] field533; - @ObfuscatedName("k") - @Export("musicTrackBoolean") - public static boolean musicTrackBoolean; - @ObfuscatedName("f") + @ObfuscatedName("a") + static int[][] field512; + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lij;" + signature = "Lif;" ) @Export("archive") final Archive archive; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1292831283 + intValue = 1214838645 ) @Export("groupCount") final int groupCount; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -95708581 + intValue = -2093675437 ) @Export("loadedCount") int loadedCount; @ObfuscatedSignature( - signature = "(Lij;Ljava/lang/String;)V" + signature = "(Lif;Ljava/lang/String;)V" ) ArchiveLoader(Archive var1, String var2) { this.loadedCount = 0; @@ -40,17 +41,17 @@ public class ArchiveLoader { this.groupCount = var1.getGroupCount(); } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1362696328" + garbageValue = "-1163747631" ) @Export("isLoaded") boolean isLoaded() { this.loadedCount = 0; for (int var1 = 0; var1 < this.groupCount; ++var1) { - if (!this.archive.method4355(var1) || this.archive.method4354(var1)) { + if (!this.archive.method4275(var1) || this.archive.method4266(var1)) { ++this.loadedCount; } } @@ -58,21 +59,39 @@ public class ArchiveLoader { return this.loadedCount >= this.groupCount; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(I)[Lik;", - garbageValue = "141715201" + signature = "(B)J", + garbageValue = "-2" ) - static VerticalAlignment[] method1177() { - return new VerticalAlignment[]{VerticalAlignment.field3200, VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field3201}; - } + static long method1156() { + try { + URL var0 = new URL(NetFileRequest.method4121("services", false) + "m=accountappeal/login.ws"); + URLConnection var1 = var0.openConnection(); + var1.setRequestProperty("connection", "close"); + var1.setDoInput(true); + var1.setDoOutput(true); + var1.setConnectTimeout(5000); + OutputStreamWriter var2 = new OutputStreamWriter(var1.getOutputStream()); + var2.write("data1=req"); + var2.flush(); + InputStream var3 = var1.getInputStream(); + Buffer var4 = new Buffer(new byte[1000]); - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-84" - ) - public static void method1178() { - class96.reflectionChecks = new IterableNodeDeque(); + 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; + } } } diff --git a/runescape-client/src/main/java/AttackOption.java b/runescape-client/src/main/java/AttackOption.java index 9ab90e679e..dfdd03463c 100644 --- a/runescape-client/src/main/java/AttackOption.java +++ b/runescape-client/src/main/java/AttackOption.java @@ -4,55 +4,49 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("co") +@ObfuscatedName("cf") @Implements("AttackOption") public enum AttackOption implements Enumerated { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lco;" + signature = "Lcf;" ) @Export("AttackOption_dependsOnCombatLevels") AttackOption_dependsOnCombatLevels(0), - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lco;" + signature = "Lcf;" ) @Export("AttackOption_alwaysRightClick") AttackOption_alwaysRightClick(1), - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lco;" + signature = "Lcf;" ) @Export("AttackOption_leftClickWhereAvailable") AttackOption_leftClickWhereAvailable(2), - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lco;" + signature = "Lcf;" ) @Export("AttackOption_hidden") AttackOption_hidden(3); - @ObfuscatedName("ox") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lcj;" + signature = "[Lmy;" ) - @Export("varcs") - static Varcs varcs; - @ObfuscatedName("fr") - @ObfuscatedSignature( - signature = "Lky;" - ) - @Export("fontPlain11") - static Font fontPlain11; - @ObfuscatedName("gt") - @ObfuscatedSignature( - signature = "[Lln;" - ) - @Export("mapMarkerSprites") - static Sprite[] mapMarkerSprites; - @ObfuscatedName("z") + @Export("JagexCache_idxFiles") + public static BufferedFile[] JagexCache_idxFiles; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 2079114159 + intValue = 478106921 + ) + @Export("canvasHeight") + public static int canvasHeight; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -201450723 ) @Export("id") final int id; @@ -61,43 +55,63 @@ public enum AttackOption implements Enumerated { this.id = var3; } - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "7" + garbageValue = "-57" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "-573010380" + signature = "(II)I", + garbageValue = "-1189493177" ) - static int method2098(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var2 == null) { + @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 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; + return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; } } - @ObfuscatedName("fq") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-940191492" + signature = "(Lha;I[B[BI)V", + garbageValue = "304370962" ) - @Export("playSong") - static void playSong(int var0) { - if (var0 == -1 && !Client.field742) { - TileItemPile.method2811(); - } else if (var0 != -1 && var0 != Client.currentTrackGroupId && Client.musicVolume != 0 && !Client.field742) { - World.method1819(2, AbstractWorldMapData.archive6, var0, 0, Client.musicVolume, false); + @Export("Widget_setKey") + static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { + if (var0.field2626 == null) { + if (var2 == null) { + return; + } + + var0.field2626 = new byte[11][]; + var0.field2629 = new byte[11][]; + var0.field2631 = new int[11]; + var0.field2670 = new int[11]; } - Client.currentTrackGroupId = var0; + var0.field2626[var1] = var2; + if (var2 != null) { + var0.field2625 = true; + } else { + var0.field2625 = false; + + for (int var4 = 0; var4 < var0.field2626.length; ++var4) { + if (var0.field2626[var4] != null) { + var0.field2625 = true; + break; + } + } + } + + var0.field2629[var1] = var3; } } diff --git a/runescape-client/src/main/java/AudioFilter.java b/runescape-client/src/main/java/AudioFilter.java index 8a999e7850..e31f49e307 100644 --- a/runescape-client/src/main/java/AudioFilter.java +++ b/runescape-client/src/main/java/AudioFilter.java @@ -6,151 +6,151 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("dh") @Implements("AudioFilter") public class AudioFilter { - @ObfuscatedName("p") - static float[][] field1474; - @ObfuscatedName("h") + @ObfuscatedName("b") + static float[][] field1445; + @ObfuscatedName("e") @Export("coefficients") static int[][] coefficients; - @ObfuscatedName("y") - static float field1478; - @ObfuscatedName("w") + @ObfuscatedName("x") + static float field1447; + @ObfuscatedName("a") @Export("forwardMultiplier") static int forwardMultiplier; - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("pairs") int[] pairs; - @ObfuscatedName("b") - int[][][] field1473; - @ObfuscatedName("g") - int[][][] field1475; - @ObfuscatedName("z") - int[] field1471; + @ObfuscatedName("y") + int[][][] field1450; + @ObfuscatedName("w") + int[][][] field1443; + @ObfuscatedName("p") + int[] field1444; static { - field1474 = new float[2][8]; + field1445 = new float[2][8]; coefficients = new int[2][8]; } AudioFilter() { this.pairs = new int[2]; - this.field1473 = new int[2][2][4]; - this.field1475 = new int[2][2][4]; - this.field1471 = new int[2]; + this.field1450 = new int[2][2][4]; + this.field1443 = new int[2][2][4]; + this.field1444 = new int[2]; } - @ObfuscatedName("u") - float method2728(int var1, int var2, float var3) { - float var4 = (float)this.field1475[var1][0][var2] + var3 * (float)(this.field1475[var1][1][var2] - this.field1475[var1][0][var2]); + @ObfuscatedName("f") + float method2710(int var1, int var2, float var3) { + float var4 = (float)this.field1443[var1][0][var2] + var3 * (float)(this.field1443[var1][1][var2] - this.field1443[var1][0][var2]); var4 *= 0.0015258789F; return 1.0F - (float)Math.pow(10.0D, (double)(-var4 / 20.0F)); } - @ObfuscatedName("b") - float method2725(int var1, int var2, float var3) { - float var4 = (float)this.field1473[var1][0][var2] + var3 * (float)(this.field1473[var1][1][var2] - this.field1473[var1][0][var2]); + @ObfuscatedName("y") + float method2700(int var1, int var2, float var3) { + float var4 = (float)this.field1450[var1][0][var2] + var3 * (float)(this.field1450[var1][1][var2] - this.field1450[var1][0][var2]); var4 *= 1.2207031E-4F; return normalize(var4); } - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("compute") int compute(int var1, float var2) { float var3; if (var1 == 0) { - var3 = (float)this.field1471[0] + (float)(this.field1471[1] - this.field1471[0]) * var2; + var3 = (float)this.field1444[0] + (float)(this.field1444[1] - this.field1444[0]) * var2; var3 *= 0.0030517578F; - field1478 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); - forwardMultiplier = (int)(field1478 * 65536.0F); + field1447 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); + forwardMultiplier = (int)(field1447 * 65536.0F); } if (this.pairs[var1] == 0) { return 0; } else { - var3 = this.method2728(var1, 0, var2); - field1474[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2725(var1, 0, var2)); - field1474[var1][1] = var3 * var3; + var3 = this.method2710(var1, 0, var2); + field1445[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2700(var1, 0, var2)); + field1445[var1][1] = var3 * var3; float[] var10000; int var4; for (var4 = 1; var4 < this.pairs[var1]; ++var4) { - var3 = this.method2728(var1, var4, var2); - float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2725(var1, var4, var2)); + var3 = this.method2710(var1, var4, var2); + float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2700(var1, var4, var2)); float var6 = var3 * var3; - field1474[var1][var4 * 2 + 1] = field1474[var1][var4 * 2 - 1] * var6; - field1474[var1][var4 * 2] = field1474[var1][var4 * 2 - 1] * var5 + field1474[var1][var4 * 2 - 2] * var6; + field1445[var1][var4 * 2 + 1] = field1445[var1][var4 * 2 - 1] * var6; + field1445[var1][var4 * 2] = field1445[var1][var4 * 2 - 1] * var5 + field1445[var1][var4 * 2 - 2] * var6; for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) { - var10000 = field1474[var1]; - var10000[var7] += field1474[var1][var7 - 1] * var5 + field1474[var1][var7 - 2] * var6; + var10000 = field1445[var1]; + var10000[var7] += field1445[var1][var7 - 1] * var5 + field1445[var1][var7 - 2] * var6; } - var10000 = field1474[var1]; - var10000[1] += field1474[var1][0] * var5 + var6; - var10000 = field1474[var1]; + var10000 = field1445[var1]; + var10000[1] += field1445[var1][0] * var5 + var6; + var10000 = field1445[var1]; var10000[0] += var5; } if (var1 == 0) { for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) { - var10000 = field1474[0]; - var10000[var4] *= field1478; + var10000 = field1445[0]; + var10000[var4] *= field1447; } } for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) { - coefficients[var1][var4] = (int)(field1474[var1][var4] * 65536.0F); + coefficients[var1][var4] = (int)(field1445[var1][var4] * 65536.0F); } return this.pairs[var1] * 2; } } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Lkg;Ldx;)V" + signature = "(Lkq;Ldo;)V" ) - final void method2729(Buffer var1, SoundEnvelope var2) { + final void method2713(Buffer var1, SoundEnvelope var2) { int var3 = var1.readUnsignedByte(); this.pairs[0] = var3 >> 4; this.pairs[1] = var3 & 15; if (var3 != 0) { - this.field1471[0] = var1.readUnsignedShort(); - this.field1471[1] = var1.readUnsignedShort(); + this.field1444[0] = var1.readUnsignedShort(); + this.field1444[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.field1473[var5][0][var6] = var1.readUnsignedShort(); - this.field1475[var5][0][var6] = var1.readUnsignedShort(); + this.field1450[var5][0][var6] = var1.readUnsignedShort(); + this.field1443[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.field1473[var5][1][var6] = var1.readUnsignedShort(); - this.field1475[var5][1][var6] = var1.readUnsignedShort(); + this.field1450[var5][1][var6] = var1.readUnsignedShort(); + this.field1443[var5][1][var6] = var1.readUnsignedShort(); } else { - this.field1473[var5][1][var6] = this.field1473[var5][0][var6]; - this.field1475[var5][1][var6] = this.field1475[var5][0][var6]; + this.field1450[var5][1][var6] = this.field1450[var5][0][var6]; + this.field1443[var5][1][var6] = this.field1443[var5][0][var6]; } } } - if (var4 != 0 || this.field1471[1] != this.field1471[0]) { + if (var4 != 0 || this.field1444[1] != this.field1444[0]) { var2.decodeSegments(var1); } } else { - int[] var7 = this.field1471; - this.field1471[1] = 0; + int[] var7 = this.field1444; + this.field1444[1] = 0; var7[0] = 0; } } - @ObfuscatedName("f") + @ObfuscatedName("i") @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 c4e65976d8..d37bb4e50b 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("kq") +@ObfuscatedName("kp") @Implements("BZip2Decompressor") public final class BZip2Decompressor { - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lko;" + signature = "Lkv;" ) @Export("BZip2Decompressor_state") static BZip2State BZip2Decompressor_state; @@ -17,7 +17,7 @@ public final class BZip2Decompressor { BZip2Decompressor_state = new BZip2State(); } - @ObfuscatedName("u") + @ObfuscatedName("f") @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.field3742 = 0; + BZip2Decompressor_state.field3726 = 0; BZip2Decompressor_decompress(BZip2Decompressor_state); var1 -= BZip2Decompressor_state.outputLength; BZip2Decompressor_state.inputArray = null; @@ -38,21 +38,21 @@ public final class BZip2Decompressor { } } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lko;)V" + signature = "(Lkv;)V" ) - static void method5895(BZip2State var0) { + static void method5816(BZip2State var0) { byte var2 = var0.out_char; int var3 = var0.su_rNToGo; int var4 = var0.nblocks_used; int var5 = var0.su_ch2; - int[] var6 = FillMode.BZip2Decompressor_block; - int var7 = var0.field3738; + int[] var6 = SoundSystem.BZip2Decompressor_block; + int var7 = var0.field3733; byte[] var8 = var0.outputArray; int var9 = var0.next_out; int var10 = var0.outputLength; - int var12 = var0.field3756 + 1; + int var12 = var0.field3742 + 1; label61: while (true) { @@ -148,25 +148,25 @@ public final class BZip2Decompressor { break; } - int var13 = var0.field3742; - var0.field3742 += var10 - var10; - if (var0.field3742 < var13) { + int var13 = var0.field3726; + var0.field3726 += var10 - var10; + if (var0.field3726 < var13) { } var0.out_char = var2; var0.su_rNToGo = var3; var0.nblocks_used = var4; var0.su_ch2 = var5; - FillMode.BZip2Decompressor_block = var6; - var0.field3738 = var7; + SoundSystem.BZip2Decompressor_block = var6; + var0.field3733 = var7; var0.outputArray = var8; var0.next_out = var9; var0.outputLength = var10; } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Lko;)V" + signature = "(Lkv;)V" ) @Export("BZip2Decompressor_decompress") static void BZip2Decompressor_decompress(BZip2State var0) { @@ -193,8 +193,8 @@ public final class BZip2Decompressor { int[] var24 = null; int[] var25 = null; var0.blockSize100k = 1410065408; - if (FillMode.BZip2Decompressor_block == null) { - FillMode.BZip2Decompressor_block = new int[var0.blockSize100k * 100000]; + if (SoundSystem.BZip2Decompressor_block == null) { + SoundSystem.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]++; - FillMode.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; + SoundSystem.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) { - FillMode.BZip2Decompressor_block[var47] = var1 & 255; + SoundSystem.BZip2Decompressor_block[var47] = var1 & 255; ++var47; } } @@ -509,22 +509,22 @@ public final class BZip2Decompressor { } for (var36 = 0; var36 < var47; ++var36) { - var1 = (byte)(FillMode.BZip2Decompressor_block[var36] & 255); - var10000 = FillMode.BZip2Decompressor_block; + var1 = (byte)(SoundSystem.BZip2Decompressor_block[var36] & 255); + var10000 = SoundSystem.BZip2Decompressor_block; int var10001 = var0.cftab[var1 & 255]; var10000[var10001] |= var36 << 8; var10002 = var0.cftab[var1 & 255]++; } - var0.field3738 = FillMode.BZip2Decompressor_block[var0.originalPointer] >> 8; + var0.field3733 = SoundSystem.BZip2Decompressor_block[var0.originalPointer] >> 8; var0.nblocks_used = 0; - var0.field3738 = FillMode.BZip2Decompressor_block[var0.field3738]; - var0.su_ch2 = (byte)(var0.field3738 & 255); - var0.field3738 >>= 8; + var0.field3733 = SoundSystem.BZip2Decompressor_block[var0.field3733]; + var0.su_ch2 = (byte)(var0.field3733 & 255); + var0.field3733 >>= 8; ++var0.nblocks_used; - var0.field3756 = var47; - method5895(var0); - if (var0.field3756 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { + var0.field3742 = var47; + method5816(var0); + if (var0.field3742 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { var26 = true; break; } @@ -538,27 +538,27 @@ public final class BZip2Decompressor { } } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lko;)B" + signature = "(Lkv;)B" ) @Export("BZip2Decompressor_readNextByte") static byte BZip2Decompressor_readNextByte(BZip2State var0) { return (byte)BZip2Decompressor_readBits(8, var0); } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Lko;)B" + signature = "(Lkv;)B" ) @Export("BZip2Decompressor_readNextBit") static byte BZip2Decompressor_readNextBit(BZip2State var0) { return (byte)BZip2Decompressor_readBits(1, var0); } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(ILko;)I" + signature = "(ILkv;)I" ) @Export("BZip2Decompressor_readBits") static int BZip2Decompressor_readBits(int var0, BZip2State var1) { @@ -576,9 +576,9 @@ public final class BZip2Decompressor { return var2; } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Lko;)V" + signature = "(Lkv;)V" ) @Export("makeMaps") static void makeMaps(BZip2State var0) { @@ -593,7 +593,7 @@ public final class BZip2Decompressor { } - @ObfuscatedName("y") + @ObfuscatedName("x") @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 8f828f534d..a1cad0e92e 100644 --- a/runescape-client/src/main/java/BZip2State.java +++ b/runescape-client/src/main/java/BZip2State.java @@ -4,167 +4,167 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ko") +@ObfuscatedName("kv") @Implements("BZip2State") public final class BZip2State { - @ObfuscatedName("u") - final int field3731; @ObfuscatedName("f") - final int field3720; - @ObfuscatedName("b") - final int field3733; - @ObfuscatedName("g") + final int field3721; + @ObfuscatedName("i") + final int field3728; + @ObfuscatedName("y") + final int field3716; + @ObfuscatedName("w") final int field3722; - @ObfuscatedName("z") - final int field3723; @ObfuscatedName("p") - final int field3724; - @ObfuscatedName("h") + final int field3735; + @ObfuscatedName("b") + final int field3719; + @ObfuscatedName("e") @Export("inputArray") byte[] inputArray; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 2112153425 + intValue = -117705425 ) @Export("nextByte") int nextByte; - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -604029507 + intValue = 808052371 ) @Export("nextBit_unused") int nextBit_unused; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("outputArray") byte[] outputArray; - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 101751211 + intValue = 862638407 ) @Export("next_out") int next_out; - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1229248277 + intValue = 982229001 ) @Export("outputLength") int outputLength; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1913236213 + intValue = -1677667273 ) - int field3742; - @ObfuscatedName("e") + int field3726; + @ObfuscatedName("k") @Export("out_char") byte out_char; - @ObfuscatedName("n") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -975314591 + intValue = -320144157 ) @Export("su_rNToGo") int su_rNToGo; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 843438185 + intValue = 720575069 ) @Export("bsBuff") int bsBuff; - @ObfuscatedName("c") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1790725095 + intValue = 846973035 ) @Export("bsLive") int bsLive; - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 2072280064 + intValue = 1197540352 ) @Export("blockSize100k") int blockSize100k; - @ObfuscatedName("d") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -233574369 + intValue = 184664593 ) @Export("originalPointer") int originalPointer; - @ObfuscatedName("s") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 396288217 + intValue = -1391220013 ) - int field3738; - @ObfuscatedName("t") + int field3733; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1359010819 + intValue = -1996939641 ) @Export("su_ch2") int su_ch2; - @ObfuscatedName("m") + @ObfuscatedName("h") @Export("unzftab") int[] unzftab; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -197163901 + intValue = 903678455 ) @Export("nblocks_used") int nblocks_used; - @ObfuscatedName("q") + @ObfuscatedName("g") @Export("cftab") int[] cftab; - @ObfuscatedName("j") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1651646591 + intValue = -1381794175 ) @Export("nInUse") int nInUse; - @ObfuscatedName("af") + @ObfuscatedName("aa") @Export("inUse") boolean[] inUse; - @ObfuscatedName("ad") + @ObfuscatedName("av") @Export("inUse16") boolean[] inUse16; - @ObfuscatedName("am") + @ObfuscatedName("aw") @Export("seqToUnseq") byte[] seqToUnseq; - @ObfuscatedName("ai") + @ObfuscatedName("as") @Export("ll8") byte[] ll8; - @ObfuscatedName("ag") + @ObfuscatedName("ak") @Export("getAndMoveToFrontDecode_yy") int[] getAndMoveToFrontDecode_yy; - @ObfuscatedName("ao") + @ObfuscatedName("au") @Export("selector") byte[] selector; - @ObfuscatedName("aw") + @ObfuscatedName("ah") @Export("selectorMtf") byte[] selectorMtf; - @ObfuscatedName("ak") + @ObfuscatedName("aq") @Export("temp_charArray2d") byte[][] temp_charArray2d; - @ObfuscatedName("aa") + @ObfuscatedName("ao") @Export("limit") int[][] limit; - @ObfuscatedName("ab") + @ObfuscatedName("an") @Export("base") int[][] base; @ObfuscatedName("ar") @Export("perm") int[][] perm; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("minLens") int[] minLens; - @ObfuscatedName("aq") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = -1771574853 + intValue = 871538763 ) - int field3756; + int field3742; BZip2State() { - this.field3731 = 4096; - this.field3720 = 16; - this.field3733 = 258; + this.field3721 = 4096; + this.field3728 = 16; + this.field3716 = 258; this.field3722 = 6; - this.field3723 = 50; - this.field3724 = 18002; + this.field3735 = 50; + this.field3719 = 18002; this.nextByte = 0; this.next_out = 0; this.unzftab = new int[256]; @@ -183,15 +183,18 @@ public final class BZip2State { this.minLens = new int[6]; } - @ObfuscatedName("z") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Lhf;Ljava/lang/String;Ljava/lang/String;I)Llm;", - garbageValue = "-972225948" + signature = "(IIB)Lha;", + garbageValue = "119" ) - @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 UserComparator6.method3491(var0, var3, var4); + @Export("getWidgetChild") + public static Widget getWidgetChild(int var0, int var1) { + Widget var2 = Tile.getWidget(var0); + if (var1 == -1) { + return var2; + } else { + return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; + } } } diff --git a/runescape-client/src/main/java/BoundaryObject.java b/runescape-client/src/main/java/BoundaryObject.java index 4111c48f5c..aa72b177b9 100644 --- a/runescape-client/src/main/java/BoundaryObject.java +++ b/runescape-client/src/main/java/BoundaryObject.java @@ -3,68 +3,67 @@ 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("er") @Implements("BoundaryObject") public final class BoundaryObject { - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -37914995 + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "Lhz;" ) - @Export("canvasWidth") - public static int canvasWidth; - @ObfuscatedName("u") + @Export("Widget_spritesArchive") + static AbstractArchive Widget_spritesArchive; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1092947403 + intValue = -1534521391 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1863121231 + intValue = -1718210699 ) @Export("x") int x; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 523556867 + intValue = -1666415467 ) @Export("y") int y; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -470947197 + intValue = -211420525 ) @Export("orientationA") int orientationA; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 113063737 + intValue = 951647449 ) @Export("orientationB") int orientationB; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "Lee;" + signature = "Lep;" ) @Export("entity1") public Entity entity1; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lee;" + signature = "Lep;" ) @Export("entity2") public Entity entity2; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - longValue = 667705109801803207L + longValue = 3162324910013074859L ) @Export("tag") public long tag; - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1624595735 + intValue = -1096622413 ) @Export("flags") int flags; @@ -74,245 +73,31 @@ public final class BoundaryObject { this.flags = 0; } - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "17" - ) - public static int method3312(int var0) { - var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); - var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); - var0 = var0 + (var0 >>> 4) & 252645135; - var0 += var0 >>> 8; - var0 += var0 >>> 16; - return var0 & 255; - } - @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;II[BII)I", - garbageValue = "549909361" + signature = "(IB)V", + garbageValue = "-13" ) - @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; + public static void method3273(int var0) { + class197.field2392 = 1; + Coord.musicTrackArchive = null; + class16.musicTrackGroupId = -1; + GrandExchangeOffer.musicTrackFileId = -1; + class197.musicTrackVolume = 0; + WorldMapDecoration.musicTrackBoolean = false; + ParamDefinition.field3275 = var0; } - @ObfuscatedName("p") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-1" + signature = "(Ljava/lang/String;II)V", + garbageValue = "-318547131" ) - public static void method3311() { - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - signature = "(ILci;ZB)I", - garbageValue = "0" - ) - static int method3313(int var0, Script var1, boolean var2) { - int var3; - int var4; - if (var0 == ScriptOpcodes.ADD) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3 + var4; - return 1; - } else if (var0 == ScriptOpcodes.SUB) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3 - var4; - return 1; - } else if (var0 == ScriptOpcodes.MULTIPLY) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3 * var4; - return 1; - } else if (var0 == ScriptOpcodes.DIV) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3 / var4; - return 1; - } else if (var0 == ScriptOpcodes.RANDOM) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); - return 1; - } else if (var0 == ScriptOpcodes.RANDOMINC) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); - return 1; - } else if (var0 == ScriptOpcodes.INTERPOLATE) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 5; - var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - int var5 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 2]; - int var6 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 3]; - int var7 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 4]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3 + (var7 - var5) * (var4 - var3) / (var6 - var5); - return 1; - } else if (var0 == ScriptOpcodes.ADDPERCENT) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3 + var3 * var4 / 100; - return 1; - } else if (var0 == ScriptOpcodes.SETBIT) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3 | 1 << var4; - return 1; - } else if (var0 == ScriptOpcodes.CLEARBIT) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); - return 1; - } else if (var0 == ScriptOpcodes.TESTBIT) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.MOD) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3 % var4; - return 1; - } else if (var0 == ScriptOpcodes.POW) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - if (var3 == 0) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); - } - - return 1; - } else if (var0 == ScriptOpcodes.INVPOW) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - if (var3 == 0) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - return 1; - } else { - switch(var4) { - case 0: - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; - break; - case 1: - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3; - break; - case 2: - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); - break; - case 3: - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); - break; - case 4: - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); - break; - default: - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); - } - - return 1; - } - } else if (var0 == ScriptOpcodes.AND) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3 & var4; - return 1; - } else if (var0 == ScriptOpcodes.OR) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3 | var4; - return 1; - } else if (var0 == ScriptOpcodes.SCALE) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 3; - long var9 = (long)Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - long var11 = (long)Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - long var13 = (long)Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 2]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = (int)(var9 * var13 / var11); - return 1; - } else { - return 2; - } + static final void method3274(String var0, int var1) { + PacketBufferNode var2 = class2.getPacketBufferNode(ClientPacket.field2219, Client.packetWriter.isaacCipher); + var2.packetBuffer.writeByte(ViewportMouse.stringCp1252NullTerminatedByteSize(var0) + 1); + var2.packetBuffer.writeStringCp1252NullTerminated(var0); + var2.packetBuffer.method5696(var1); + Client.packetWriter.addNode(var2); } } diff --git a/runescape-client/src/main/java/Bounds.java b/runescape-client/src/main/java/Bounds.java index 31fd5a44e9..cf5941aef7 100644 --- a/runescape-client/src/main/java/Bounds.java +++ b/runescape-client/src/main/java/Bounds.java @@ -4,30 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lw") +@ObfuscatedName("lh") @Implements("Bounds") public class Bounds { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -460052355 + intValue = -136751855 ) @Export("lowX") public int lowX; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -2012134471 + intValue = 1318120515 ) @Export("lowY") public int lowY; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -295033527 + intValue = -388222223 ) @Export("highX") public int highX; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 168990255 + intValue = 1704369811 ) @Export("highY") public int highY; @@ -41,10 +41,10 @@ public class Bounds { this(0, 0, var1, var2); } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "2660177" + garbageValue = "-535694945" ) @Export("setLow") public void setLow(int var1, int var2) { @@ -52,10 +52,10 @@ public class Bounds { this.lowY = var2; } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "-2094067134" + signature = "(IIB)V", + garbageValue = "69" ) @Export("setHigh") public void setHigh(int var1, int var2) { @@ -63,22 +63,22 @@ public class Bounds { this.highY = var2; } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Llw;Llw;I)V", - garbageValue = "-1378813027" + signature = "(Llh;Llh;I)V", + garbageValue = "871538763" ) - public void method6069(Bounds var1, Bounds var2) { - this.method6070(var1, var2); - this.method6071(var1, var2); + public void method5997(Bounds var1, Bounds var2) { + this.method6005(var1, var2); + this.method5999(var1, var2); } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Llw;Llw;B)V", - garbageValue = "6" + signature = "(Llh;Llh;I)V", + garbageValue = "-541537742" ) - void method6070(Bounds var1, Bounds var2) { + void method6005(Bounds var1, Bounds var2) { var2.lowX = this.lowX; var2.highX = this.highX; if (this.lowX < var1.lowX) { @@ -86,8 +86,8 @@ public class Bounds { var2.lowX = var1.lowX; } - if (var2.method6086() > var1.method6086()) { - var2.highX -= var2.method6086() - var1.method6086(); + if (var2.method6000() > var1.method6000()) { + var2.highX -= var2.method6000() - var1.method6000(); } if (var2.highX < 0) { @@ -96,12 +96,12 @@ public class Bounds { } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Llw;Llw;B)V", - garbageValue = "72" + signature = "(Llh;Llh;B)V", + garbageValue = "-89" ) - void method6071(Bounds var1, Bounds var2) { + void method5999(Bounds var1, Bounds var2) { var2.lowY = this.lowY; var2.highY = this.highY; if (this.lowY < var1.lowY) { @@ -109,8 +109,8 @@ public class Bounds { var2.lowY = var1.lowY; } - if (var2.method6085() > var1.method6085()) { - var2.highY -= var2.method6085() - var1.method6085(); + if (var2.method5994() > var1.method5994()) { + var2.highY -= var2.method5994() - var1.method5994(); } if (var2.highY < 0) { @@ -119,21 +119,21 @@ public class Bounds { } - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(S)I", - garbageValue = "-14495" - ) - int method6086() { - return this.highX + this.lowX; - } - - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1630571197" + garbageValue = "1022454109" ) - int method6085() { + int method6000() { + return this.lowX + this.highX; + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "(B)I", + garbageValue = "1" + ) + int method5994() { return this.highY + this.lowY; } diff --git a/runescape-client/src/main/java/Buddy.java b/runescape-client/src/main/java/Buddy.java index f151e5240a..762e63d0ce 100644 --- a/runescape-client/src/main/java/Buddy.java +++ b/runescape-client/src/main/java/Buddy.java @@ -1,3 +1,5 @@ +import java.io.IOException; +import java.net.Socket; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; @@ -7,21 +9,21 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("jt") @Implements("Buddy") public class Buddy extends User { - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1985676249 + intValue = 945410251 ) @Export("world") public int world; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1502929201 + intValue = 509966379 ) @Export("int2") public int int2; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -588738279 + intValue = -1815065489 ) @Export("rank") public int rank; @@ -30,10 +32,10 @@ public class Buddy extends User { this.world = -1; } - @ObfuscatedName("ar") + @ObfuscatedName("am") @ObfuscatedSignature( - signature = "(IIS)V", - garbageValue = "13296" + signature = "(III)V", + garbageValue = "-309378639" ) @Export("set") void set(int var1, int var2) { @@ -41,36 +43,101 @@ public class Buddy extends User { this.int2 = var2; } - @ObfuscatedName("av") + @ObfuscatedName("ab") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1862219925" + garbageValue = "-1803035811" ) @Export("getWorld") public int getWorld() { return this.world; } - @ObfuscatedName("aq") + @ObfuscatedName("bj") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-127464442" + garbageValue = "-1364700600" ) @Export("hasWorld") public boolean hasWorld() { return this.world > 0; } - @ObfuscatedName("g") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "595265698" + signature = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "1663251439" ) - static void method5251() { - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { - Login.currentLoginField = 1; - } else { - Login.currentLoginField = 0; + public static String method5214(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 = ScriptFrame.method1110(var5); + } + + if (Character.isLetter(var5)) { + var3 = 0; + } else if (var5 != '.' && var5 != '?' && var5 != '!') { + if (Character.isSpaceChar(var5)) { + if (var3 != 2) { + var3 = 1; + } + } else { + var3 = 1; + } + } else { + var3 = 2; + } + + var2[var4] = var5; + } + + return new String(var2); + } + + @ObfuscatedName("an") + @ObfuscatedSignature( + signature = "(Ljava/net/Socket;III)Lky;", + garbageValue = "62058076" + ) + public static AbstractSocket method5215(Socket var0, int var1, int var2) throws IOException { + return new BufferedNetSocket(var0, var1, var2); + } + + @ObfuscatedName("kt") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "-16" + ) + static void method5211() { + for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { + int var1 = var0.group; + if (MusicPatch.loadInterface(var1)) { + boolean var2 = true; + Widget[] var3 = UserComparator7.Widget_interfaceComponents[var1]; + + int var4; + for (var4 = 0; var4 < var3.length; ++var4) { + if (var3[var4] != null) { + var2 = var3[var4].isIf3; + break; + } + } + + if (!var2) { + var4 = (int)var0.key; + Widget var5 = Tile.getWidget(var4); + if (var5 != null) { + LoginPacket.invalidateWidget(var5); + } + } + } } } diff --git a/runescape-client/src/main/java/BuddyRankComparator.java b/runescape-client/src/main/java/BuddyRankComparator.java index f943d956e1..a48bac0557 100644 --- a/runescape-client/src/main/java/BuddyRankComparator.java +++ b/runescape-client/src/main/java/BuddyRankComparator.java @@ -1,27 +1,13 @@ +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("fj") +@ObfuscatedName("ed") @Implements("BuddyRankComparator") public class BuddyRankComparator extends AbstractUserComparator { - @ObfuscatedName("rm") - @ObfuscatedGetter( - intValue = -773868241 - ) - static int field1998; - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lfp;" - ) - @Export("clock") - protected static Clock clock; - @ObfuscatedName("gd") - @Export("regionMapArchiveIds") - static int[] regionMapArchiveIds; - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("reversed") final boolean reversed; @@ -29,10 +15,10 @@ public class BuddyRankComparator extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Ljt;Ljt;I)I", - garbageValue = "-525022889" + signature = "(Ljt;Ljt;B)I", + garbageValue = "70" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -47,16 +33,98 @@ public class BuddyRankComparator extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Lhf;Lhf;Lhf;Lgz;I)Z", - garbageValue = "-2130405669" + signature = "(ZB)V", + garbageValue = "-2" ) - public static boolean method3483(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, MidiPcmStream var3) { - class197.musicPatchesArchive = var0; - class197.musicSamplesArchive = var1; - class197.soundEffectsArchive = var2; - FaceNormal.midiPcmStream = var3; - return true; + public static void method3362(boolean var0) { + if (class297.NetCache_socket != null) { + try { + Buffer var1 = new Buffer(4); + var1.writeByte(var0 ? 2 : 3); + var1.writeMedium(0); + class297.NetCache_socket.write(var1.array, 0, 4); + } catch (IOException var4) { + try { + class297.NetCache_socket.close(); + } catch (Exception var3) { + } + + ++NetCache.NetCache_ioExceptions; + class297.NetCache_socket = null; + } + + } + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "(Lhz;Lhz;I)Z", + garbageValue = "-1979792654" + ) + public static boolean method3363(AbstractArchive var0, AbstractArchive var1) { + WorldMapElement.WorldMapElement_archive = var1; + if (!var0.isFullyLoaded()) { + return false; + } else { + class180.WorldMapElement_count = var0.getGroupFileCount(35); + WorldMapElement.WorldMapElement_cached = new WorldMapElement[class180.WorldMapElement_count]; + + for (int var2 = 0; var2 < class180.WorldMapElement_count; ++var2) { + byte[] var3 = var0.takeFile(35, var2); + WorldMapElement.WorldMapElement_cached[var2] = new WorldMapElement(var2); + if (var3 != null) { + WorldMapElement.WorldMapElement_cached[var2].decode(new Buffer(var3)); + WorldMapElement.WorldMapElement_cached[var2].method4360(); + } + } + + return true; + } + } + + @ObfuscatedName("gd") + @ObfuscatedSignature( + signature = "(Lbn;III)V", + garbageValue = "-49955773" + ) + @Export("performPlayerAnimation") + static void performPlayerAnimation(Player var0, int var1, int var2) { + if (var0.sequence == var1 && var1 != -1) { + int var3 = WorldMapSection0.SequenceDefinition_get(var1).field3495; + if (var3 == 1) { + var0.sequenceFrame = 0; + var0.sequenceFrameCycle = 0; + var0.sequenceDelay = var2; + var0.field958 = 0; + } + + if (var3 == 2) { + var0.field958 = 0; + } + } else if (var1 == -1 || var0.sequence == -1 || WorldMapSection0.SequenceDefinition_get(var1).field3492 >= WorldMapSection0.SequenceDefinition_get(var0.sequence).field3492) { + var0.sequence = var1; + var0.sequenceFrame = 0; + var0.sequenceFrameCycle = 0; + var0.sequenceDelay = var2; + var0.field958 = 0; + var0.field926 = var0.pathLength; + } + + } + + @ObfuscatedName("jg") + @ObfuscatedSignature( + signature = "(IB)V", + garbageValue = "73" + ) + static void method3361(int var0) { + LoginType.tempMenuAction = new MenuAction(); + LoginType.tempMenuAction.param0 = Client.menuArguments1[var0]; + LoginType.tempMenuAction.param1 = Client.menuArguments2[var0]; + LoginType.tempMenuAction.opcode = Client.menuOpcodes[var0]; + LoginType.tempMenuAction.identifier = Client.menuIdentifiers[var0]; + LoginType.tempMenuAction.action = Client.menuActions[var0]; } } diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java index 794dce2579..4e49a4c044 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("kg") +@ObfuscatedName("kq") @Implements("Buffer") public class Buffer extends Node { - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("crc32Table") static int[] crc32Table; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("crc64Table") static long[] crc64Table; - @ObfuscatedName("p") + @ObfuscatedName("b") @Export("array") public byte[] array; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1187800467 + intValue = -974427465 ) @Export("offset") public int offset; @@ -61,7 +61,7 @@ public class Buffer extends Node { } public Buffer(int var1) { - this.array = UserComparator9.ByteArrayPool_getArray(var1); + this.array = class218.ByteArrayPool_getArray(var1); this.offset = 0; } @@ -70,34 +70,34 @@ public class Buffer extends Node { this.offset = 0; } - @ObfuscatedName("ap") + @ObfuscatedName("ax") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "-46" + garbageValue = "-1" ) @Export("releaseArray") public void releaseArray() { if (this.array != null) { - Skeleton.ByteArrayPool_release(this.array); + GraphicsDefaults.ByteArrayPool_release(this.array); } this.array = null; } - @ObfuscatedName("an") + @ObfuscatedName("at") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "2118821041" + garbageValue = "-1741213473" ) @Export("writeByte") public void writeByte(int var1) { this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("al") + @ObfuscatedName("af") @ObfuscatedSignature( signature = "(IB)V", - garbageValue = "-1" + garbageValue = "2" ) @Export("writeShort") public void writeShort(int var1) { @@ -105,10 +105,10 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("ay") + @ObfuscatedName("ap") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "0" + signature = "(II)V", + garbageValue = "-2091001139" ) @Export("writeMedium") public void writeMedium(int var1) { @@ -117,10 +117,10 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("ax") + @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "56" + signature = "(II)V", + garbageValue = "49619739" ) @Export("writeInt") public void writeInt(int var1) { @@ -130,7 +130,7 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("au") + @ObfuscatedName("am") @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("as") + @ObfuscatedName("ab") @Export("writeLong") public void writeLong(long var1) { this.array[++this.offset - 1] = (byte)((int)(var1 >> 56)); @@ -154,20 +154,20 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)((int)var1); } - @ObfuscatedName("ah") + @ObfuscatedName("bj") @ObfuscatedSignature( signature = "(ZB)V", - garbageValue = "14" + garbageValue = "52" ) @Export("writeBoolean") public void writeBoolean(boolean var1) { this.writeByte(var1 ? 1 : 0); } - @ObfuscatedName("bo") + @ObfuscatedName("bw") @ObfuscatedSignature( signature = "(Ljava/lang/String;I)V", - garbageValue = "-1755897392" + garbageValue = "2103649600" ) @Export("writeStringCp1252NullTerminated") public void writeStringCp1252NullTerminated(String var1) { @@ -175,15 +175,15 @@ public class Buffer extends Node { if (var2 >= 0) { throw new IllegalArgumentException(""); } else { - this.offset += BoundaryObject.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); + this.offset += class32.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); this.array[++this.offset - 1] = 0; } } - @ObfuscatedName("bx") + @ObfuscatedName("bl") @ObfuscatedSignature( signature = "(Ljava/lang/String;I)V", - garbageValue = "1903174229" + garbageValue = "1339106309" ) @Export("writeStringCp1252NullCircumfixed") public void writeStringCp1252NullCircumfixed(String var1) { @@ -192,28 +192,28 @@ public class Buffer extends Node { throw new IllegalArgumentException(""); } else { this.array[++this.offset - 1] = 0; - this.offset += BoundaryObject.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); + this.offset += class32.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); this.array[++this.offset - 1] = 0; } } - @ObfuscatedName("bu") + @ObfuscatedName("bq") @ObfuscatedSignature( signature = "(Ljava/lang/CharSequence;I)V", - garbageValue = "124331679" + garbageValue = "104360038" ) @Export("writeCESU8") public void writeCESU8(CharSequence var1) { - int var2 = AbstractWorldMapData.method284(var1); + int var2 = class3.method35(var1); this.array[++this.offset - 1] = 0; this.writeVarInt(var2); - this.offset += ArchiveDiskAction.method4229(this.array, this.offset, var1); + this.offset += Strings.method4095(this.array, this.offset, var1); } - @ObfuscatedName("bd") + @ObfuscatedName("bx") @ObfuscatedSignature( - signature = "([BIIB)V", - garbageValue = "21" + signature = "([BIII)V", + garbageValue = "1871386509" ) @Export("writeBytes") public void writeBytes(byte[] var1, int var2, int var3) { @@ -223,10 +223,10 @@ public class Buffer extends Node { } - @ObfuscatedName("bn") + @ObfuscatedName("bc") @ObfuscatedSignature( signature = "(IB)V", - garbageValue = "1" + garbageValue = "10" ) @Export("writeLengthInt") public void writeLengthInt(int var1) { @@ -240,10 +240,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("bj") + @ObfuscatedName("by") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-1717604297" + signature = "(IB)V", + garbageValue = "-119" ) @Export("writeLengthShort") public void writeLengthShort(int var1) { @@ -255,10 +255,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("bm") + @ObfuscatedName("bz") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "67" + signature = "(II)V", + garbageValue = "600259384" ) @Export("writeLengthByte") public void writeLengthByte(int var1) { @@ -269,10 +269,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("bq") + @ObfuscatedName("bm") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "1696071523" + garbageValue = "-1935597490" ) @Export("writeSmartByteShort") public void writeSmartByteShort(int var1) { @@ -285,10 +285,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("bf") + @ObfuscatedName("bo") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "-38" + signature = "(II)V", + garbageValue = "1722354173" ) @Export("writeVarInt") public void writeVarInt(int var1) { @@ -311,30 +311,30 @@ public class Buffer extends Node { this.writeByte(var1 & 127); } - @ObfuscatedName("by") + @ObfuscatedName("bs") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "981075318" + garbageValue = "-465262399" ) @Export("readUnsignedByte") public int readUnsignedByte() { return this.array[++this.offset - 1] & 255; } - @ObfuscatedName("br") + @ObfuscatedName("ba") @ObfuscatedSignature( - signature = "(I)B", - garbageValue = "2139724295" + signature = "(S)B", + garbageValue = "-9846" ) @Export("readByte") public byte readByte() { return this.array[++this.offset - 1]; } - @ObfuscatedName("ba") + @ObfuscatedName("bn") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1493264537" + garbageValue = "252196330" ) @Export("readUnsignedShort") public int readUnsignedShort() { @@ -344,8 +344,8 @@ public class Buffer extends Node { @ObfuscatedName("bb") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-2064115104" + signature = "(B)I", + garbageValue = "-76" ) @Export("readShort") public int readShort() { @@ -358,10 +358,10 @@ public class Buffer extends Node { return var1; } - @ObfuscatedName("bg") + @ObfuscatedName("bh") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-142746027" + signature = "(B)I", + garbageValue = "70" ) @Export("readMedium") public int readMedium() { @@ -369,10 +369,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("bw") + @ObfuscatedName("bv") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1280310408" + garbageValue = "1030598931" ) @Export("readInt") public int readInt() { @@ -380,10 +380,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) + ((this.array[this.offset - 4] & 255) << 24); } - @ObfuscatedName("be") + @ObfuscatedName("bu") @ObfuscatedSignature( - signature = "(I)J", - garbageValue = "-433708522" + signature = "(B)J", + garbageValue = "-108" ) @Export("readLong") public long readLong() { @@ -392,20 +392,20 @@ public class Buffer extends Node { return (var1 << 32) + var3; } - @ObfuscatedName("bt") + @ObfuscatedName("be") @ObfuscatedSignature( - signature = "(S)Z", - garbageValue = "128" + signature = "(I)Z", + garbageValue = "-1652642398" ) @Export("readBoolean") public boolean readBoolean() { return (this.readUnsignedByte() & 1) == 1; } - @ObfuscatedName("bl") + @ObfuscatedName("bd") @ObfuscatedSignature( - signature = "(S)Ljava/lang/String;", - garbageValue = "383" + signature = "(I)Ljava/lang/String;", + garbageValue = "1889291164" ) @Export("readStringCp1252NullTerminatedOrNull") public String readStringCp1252NullTerminatedOrNull() { @@ -417,10 +417,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("bp") + @ObfuscatedName("bf") @ObfuscatedSignature( signature = "(I)Ljava/lang/String;", - garbageValue = "-510997912" + garbageValue = "-1443383745" ) @Export("readStringCp1252NullTerminated") public String readStringCp1252NullTerminated() { @@ -430,13 +430,13 @@ public class Buffer extends Node { } int var2 = this.offset - var1 - 1; - return var2 == 0 ? "" : NetCache.decodeStringCp1252(this.array, var1, var2); + return var2 == 0 ? "" : class225.decodeStringCp1252(this.array, var1, var2); } - @ObfuscatedName("bv") + @ObfuscatedName("bi") @ObfuscatedSignature( - signature = "(I)Ljava/lang/String;", - garbageValue = "-1601573396" + signature = "(B)Ljava/lang/String;", + garbageValue = "9" ) @Export("readStringCp1252NullCircumfixed") public String readStringCp1252NullCircumfixed() { @@ -450,14 +450,14 @@ public class Buffer extends Node { } int var3 = this.offset - var2 - 1; - return var3 == 0 ? "" : NetCache.decodeStringCp1252(this.array, var2, var3); + return var3 == 0 ? "" : class225.decodeStringCp1252(this.array, var2, var3); } } - @ObfuscatedName("bs") + @ObfuscatedName("br") @ObfuscatedSignature( - signature = "(I)Ljava/lang/String;", - garbageValue = "-180311328" + signature = "(B)Ljava/lang/String;", + garbageValue = "-7" ) @Export("readCESU8") public String readCESU8() { @@ -476,7 +476,7 @@ public class Buffer extends Node { int var8 = var5; int var11; - for (int var9 = var5 + var2; var8 < var9; var6[var7++] = (char)var11) { + for (int var9 = var2 + var5; var8 < var9; var6[var7++] = (char)var11) { int var10 = var4[var8++] & 255; if (var10 < 128) { if (var10 == 0) { @@ -527,10 +527,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("bz") + @ObfuscatedName("bt") @ObfuscatedSignature( signature = "([BIII)V", - garbageValue = "713077513" + garbageValue = "-991608538" ) @Export("readBytes") public void readBytes(byte[] var1, int var2, int var3) { @@ -540,10 +540,10 @@ public class Buffer extends Node { } - @ObfuscatedName("bc") + @ObfuscatedName("bp") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "60" + garbageValue = "53" ) @Export("readShortSmart") public int readShortSmart() { @@ -551,10 +551,10 @@ public class Buffer extends Node { return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; } - @ObfuscatedName("bh") + @ObfuscatedName("co") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "896603690" + garbageValue = "-1683950502" ) @Export("readUShortSmart") public int readUShortSmart() { @@ -562,12 +562,12 @@ public class Buffer extends Node { return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; } - @ObfuscatedName("bk") + @ObfuscatedName("cp") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1915469336" + garbageValue = "-1533459014" ) - public int method5710() { + public int method5558() { int var1 = 0; int var2; @@ -579,21 +579,21 @@ public class Buffer extends Node { return var1; } - @ObfuscatedName("cm") - @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-109" - ) - public int method5617() { - return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); - } - @ObfuscatedName("cd") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1394561672" + garbageValue = "-1600881896" ) - public int method5618() { + public int method5559() { + return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); + } + + @ObfuscatedName("cj") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "406513070" + ) + public int method5560() { if (this.array[this.offset] < 0) { return this.readInt() & Integer.MAX_VALUE; } else { @@ -602,10 +602,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("cv") + @ObfuscatedName("cq") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-681860010" + garbageValue = "2058260314" ) @Export("readVarInt") public int readVarInt() { @@ -619,10 +619,10 @@ public class Buffer extends Node { return var2 | var1; } - @ObfuscatedName("cl") + @ObfuscatedName("cb") @ObfuscatedSignature( signature = "([II)V", - garbageValue = "1250000974" + garbageValue = "-1596114237" ) @Export("xteaEncryptAll") public void xteaEncryptAll(int[] var1) { @@ -647,10 +647,10 @@ public class Buffer extends Node { } - @ObfuscatedName("cg") + @ObfuscatedName("cf") @ObfuscatedSignature( signature = "([II)V", - garbageValue = "1827488017" + garbageValue = "1737935822" ) @Export("xteaDecryptAll") public void xteaDecryptAll(int[] var1) { @@ -675,10 +675,10 @@ public class Buffer extends Node { } - @ObfuscatedName("ch") + @ObfuscatedName("cs") @ObfuscatedSignature( signature = "([IIII)V", - garbageValue = "1249213138" + garbageValue = "1065285661" ) @Export("xteaEncrypt") public void xteaEncrypt(int[] var1, int var2, int var3) { @@ -705,10 +705,10 @@ public class Buffer extends Node { this.offset = var4; } - @ObfuscatedName("co") + @ObfuscatedName("ch") @ObfuscatedSignature( - signature = "([IIIS)V", - garbageValue = "22292" + signature = "([IIIB)V", + garbageValue = "1" ) @Export("xteaDecrypt") public void xteaDecrypt(int[] var1, int var2, int var3) { @@ -735,10 +735,10 @@ public class Buffer extends Node { this.offset = var4; } - @ObfuscatedName("cr") + @ObfuscatedName("ca") @ObfuscatedSignature( - signature = "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V", - garbageValue = "161696795" + signature = "(Ljava/math/BigInteger;Ljava/math/BigInteger;B)V", + garbageValue = "1" ) @Export("encryptRsa") public void encryptRsa(BigInteger var1, BigInteger var2) { @@ -754,180 +754,179 @@ public class Buffer extends Node { this.writeBytes(var7, 0, var7.length); } - @ObfuscatedName("ck") + @ObfuscatedName("cn") @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "-112" + signature = "(II)I", + garbageValue = "-1528934542" ) @Export("writeCrc") public int writeCrc(int var1) { - int var2 = UserComparator5.method3467(this.array, var1, this.offset); + int var2 = Timer.method5033(this.array, var1, this.offset); this.writeInt(var2); return var2; } - @ObfuscatedName("cb") + @ObfuscatedName("cx") @ObfuscatedSignature( - signature = "(S)Z", - garbageValue = "13755" + signature = "(I)Z", + garbageValue = "1162985517" ) @Export("checkCrc") public boolean checkCrc() { this.offset -= 4; - int var1 = UserComparator5.method3467(this.array, 0, this.offset); + int var1 = Timer.method5033(this.array, 0, this.offset); int var2 = this.readInt(); - return var2 == var1; + return var1 == var2; } - @ObfuscatedName("cy") + @ObfuscatedName("ck") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "2047890611" + garbageValue = "1226995915" ) - public void method5598(int var1) { + public void method5569(int var1) { this.array[++this.offset - 1] = (byte)(var1 + 128); } - @ObfuscatedName("cn") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-1379722724" - ) - public void method5628(int var1) { - this.array[++this.offset - 1] = (byte)(0 - var1); - } - - @ObfuscatedName("cj") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "709584424" - ) - @Export("writeIntME") - public void writeIntME(int var1) { - this.array[++this.offset - 1] = (byte)(128 - var1); - } - - @ObfuscatedName("cq") - @ObfuscatedSignature( - signature = "(S)I", - garbageValue = "128" - ) - public int method5728() { - return this.array[++this.offset - 1] - 128 & 255; - } - - @ObfuscatedName("ci") - @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1543854045" - ) - public int method5631() { - return 0 - this.array[++this.offset - 1] & 255; - } - - @ObfuscatedName("cu") - @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-1082297230" - ) - public int method5689() { - return 128 - this.array[++this.offset - 1] & 255; - } - - @ObfuscatedName("cs") - @ObfuscatedSignature( - signature = "(I)B", - garbageValue = "1164121747" - ) - public byte method5633() { - return (byte)(this.array[++this.offset - 1] - 128); - } - - @ObfuscatedName("cc") - @ObfuscatedSignature( - signature = "(I)B", - garbageValue = "-839452095" - ) - public byte method5637() { - return (byte)(0 - this.array[++this.offset - 1]); - } - - @ObfuscatedName("cp") - @ObfuscatedSignature( - signature = "(B)B", - garbageValue = "-65" - ) - public byte method5772() { - return (byte)(128 - this.array[++this.offset - 1]); - } - @ObfuscatedName("ce") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "1799174836" + garbageValue = "-532797740" ) - public void method5636(int var1) { - this.array[++this.offset - 1] = (byte)var1; - this.array[++this.offset - 1] = (byte)(var1 >> 8); + public void method5720(int var1) { + this.array[++this.offset - 1] = (byte)(0 - var1); } - @ObfuscatedName("ca") - @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "-8" - ) - public void method5613(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); - this.array[++this.offset - 1] = (byte)(var1 + 128); - } - - @ObfuscatedName("cf") + @ObfuscatedName("cu") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "23275811" + garbageValue = "-1575926021" ) - @Export("writeShortLE") - public void writeShortLE(int var1) { - this.array[++this.offset - 1] = (byte)(var1 + 128); - this.array[++this.offset - 1] = (byte)(var1 >> 8); + public void method5696(int var1) { + this.array[++this.offset - 1] = (byte)(128 - var1); } - @ObfuscatedName("cx") - @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "92" - ) - public int method5719() { - this.offset += 2; - return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); - } - - @ObfuscatedName("cz") + @ObfuscatedName("cg") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-699058931" + garbageValue = "1475390763" ) - public int method5640() { - this.offset += 2; - return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); + public int method5572() { + return this.array[++this.offset - 1] - 128 & 255; } @ObfuscatedName("ct") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-2077720731" + signature = "(B)I", + garbageValue = "25" ) - public int method5641() { + public int method5675() { + return 0 - this.array[++this.offset - 1] & 255; + } + + @ObfuscatedName("cr") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "-997591738" + ) + public int method5628() { + return 128 - this.array[++this.offset - 1] & 255; + } + + @ObfuscatedName("cy") + @ObfuscatedSignature( + signature = "(I)B", + garbageValue = "2082648513" + ) + public byte method5575() { + return (byte)(this.array[++this.offset - 1] - 128); + } + + @ObfuscatedName("cz") + @ObfuscatedSignature( + signature = "(I)B", + garbageValue = "768698766" + ) + public byte method5576() { + return (byte)(0 - this.array[++this.offset - 1]); + } + + @ObfuscatedName("cm") + @ObfuscatedSignature( + signature = "(I)B", + garbageValue = "-1982248202" + ) + public byte method5577() { + return (byte)(128 - this.array[++this.offset - 1]); + } + + @ObfuscatedName("cl") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "829423539" + ) + @Export("writeIntME") + public void writeIntME(int var1) { + this.array[++this.offset - 1] = (byte)var1; + this.array[++this.offset - 1] = (byte)(var1 >> 8); + } + + @ObfuscatedName("ci") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "-1832241296" + ) + public void method5579(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); + this.array[++this.offset - 1] = (byte)(var1 + 128); + } + + @ObfuscatedName("cc") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "375556310" + ) + public void method5746(int var1) { + this.array[++this.offset - 1] = (byte)(var1 + 128); + this.array[++this.offset - 1] = (byte)(var1 >> 8); + } + + @ObfuscatedName("cv") + @ObfuscatedSignature( + signature = "(B)I", + garbageValue = "26" + ) + public int method5723() { this.offset += 2; - return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); + return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); } @ObfuscatedName("cw") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1939464839" + garbageValue = "989740563" ) - public int method5765() { + public int method5582() { + this.offset += 2; + return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); + } + + @ObfuscatedName("do") + @ObfuscatedSignature( + signature = "(B)I", + garbageValue = "1" + ) + public int method5583() { + this.offset += 2; + return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); + } + + @ObfuscatedName("dk") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "572488175" + ) + public int method5584() { this.offset += 2; int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); if (var1 > 32767) { @@ -937,14 +936,14 @@ public class Buffer extends Node { return var1; } - @ObfuscatedName("dw") + @ObfuscatedName("dx") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1382531763" + garbageValue = "1271070909" ) - public int method5643() { + public int method5565() { this.offset += 2; - int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); + int var1 = (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); if (var1 > 32767) { var1 -= 65536; } @@ -954,160 +953,140 @@ public class Buffer extends Node { @ObfuscatedName("de") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-163163988" + signature = "(IB)V", + garbageValue = "-22" ) - public void method5627(int var1) { + public void method5586(int var1) { + this.array[++this.offset - 1] = (byte)var1; this.array[++this.offset - 1] = (byte)(var1 >> 8); this.array[++this.offset - 1] = (byte)(var1 >> 16); - this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("dx") - @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1088416772" - ) - public int method5645() { - this.offset += 3; - return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16); - } - - @ObfuscatedName("dc") + @ObfuscatedName("df") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "2035333434" + garbageValue = "1666942102" ) - public void method5811(int var1) { + public void method5744(int var1) { this.array[++this.offset - 1] = (byte)var1; this.array[++this.offset - 1] = (byte)(var1 >> 8); this.array[++this.offset - 1] = (byte)(var1 >> 16); this.array[++this.offset - 1] = (byte)(var1 >> 24); } - @ObfuscatedName("dk") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "272743804" - ) - public void method5647(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); - this.array[++this.offset - 1] = (byte)var1; - this.array[++this.offset - 1] = (byte)(var1 >> 24); - this.array[++this.offset - 1] = (byte)(var1 >> 16); - } - - @ObfuscatedName("dj") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "476827595" - ) - public void method5648(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 16); - this.array[++this.offset - 1] = (byte)(var1 >> 24); - this.array[++this.offset - 1] = (byte)var1; - this.array[++this.offset - 1] = (byte)(var1 >> 8); - } - - @ObfuscatedName("dp") - @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1875662145" - ) - public int method5649() { - 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("di") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-68" + signature = "(II)V", + garbageValue = "-1515627566" ) - public int method5650() { + @Export("writeShortLE") + public void writeShortLE(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); + this.array[++this.offset - 1] = (byte)var1; + this.array[++this.offset - 1] = (byte)(var1 >> 24); + this.array[++this.offset - 1] = (byte)(var1 >> 16); + } + + @ObfuscatedName("dr") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "-511439532" + ) + public void method5587(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 16); + this.array[++this.offset - 1] = (byte)(var1 >> 24); + this.array[++this.offset - 1] = (byte)var1; + this.array[++this.offset - 1] = (byte)(var1 >> 8); + } + + @ObfuscatedName("dg") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "-154665051" + ) + public int method5590() { + this.offset += 4; + return (this.array[this.offset - 4] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16) + ((this.array[this.offset - 1] & 255) << 24); + } + + @ObfuscatedName("dh") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "1197658984" + ) + public int method5591() { this.offset += 4; return ((this.array[this.offset - 2] & 255) << 24) + ((this.array[this.offset - 4] & 255) << 8) + (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 1] & 255) << 16); } - @ObfuscatedName("dn") + @ObfuscatedName("dl") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-163399300" + signature = "(B)I", + garbageValue = "84" ) - public int method5588() { + public int method5592() { 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("o") + @ObfuscatedName("da") @ObfuscatedSignature( - signature = "([BI)V", - garbageValue = "875536376" + signature = "([BIII)V", + garbageValue = "1567135679" ) - @Export("SpriteBuffer_decode") - static void SpriteBuffer_decode(byte[] var0) { - Buffer var1 = new Buffer(var0); - var1.offset = var0.length - 2; - class325.SpriteBuffer_spriteCount = var1.readUnsignedShort(); - UrlRequester.SpriteBuffer_xOffsets = new int[class325.SpriteBuffer_spriteCount]; - class216.SpriteBuffer_yOffsets = new int[class325.SpriteBuffer_spriteCount]; - class325.SpriteBuffer_spriteWidths = new int[class325.SpriteBuffer_spriteCount]; - VarcInt.SpriteBuffer_spriteHeights = new int[class325.SpriteBuffer_spriteCount]; - FillMode.SpriteBuffer_pixels = new byte[class325.SpriteBuffer_spriteCount][]; - var1.offset = var0.length - 7 - class325.SpriteBuffer_spriteCount * 8; - class325.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); - UserComparator9.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); - int var2 = (var1.readUnsignedByte() & 255) + 1; - - int var3; - for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) { - UrlRequester.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) { - class216.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) { - VarcInt.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 = VarcInt.SpriteBuffer_spriteHeights[var3]; - int var6 = var4 * var5; - byte[] var7 = new byte[var6]; - FillMode.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(); - } - } - } + public void method5593(byte[] var1, int var2, int var3) { + for (int var4 = var3 + var2 - 1; var4 >= var2; --var4) { + var1[var4] = this.array[++this.offset - 1]; } } + + @ObfuscatedName("dp") + @ObfuscatedSignature( + signature = "([BIII)V", + garbageValue = "-448986261" + ) + public void method5740(byte[] var1, int var2, int var3) { + for (int var4 = var2; var4 < var3 + var2; ++var4) { + var1[var4] = (byte)(this.array[++this.offset - 1] - 128); + } + + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "(I)Lls;", + garbageValue = "-2068256812" + ) + static Sprite method5689() { + Sprite var0 = new Sprite(); + var0.width = class325.SpriteBuffer_spriteWidth; + var0.height = class325.SpriteBuffer_spriteHeight; + var0.xOffset = class325.SpriteBuffer_xOffsets[0]; + var0.yOffset = class325.SpriteBuffer_yOffsets[0]; + var0.subWidth = UserComparator1.SpriteBuffer_spriteWidths[0]; + var0.subHeight = class325.SpriteBuffer_spriteHeights[0]; + int var1 = var0.subHeight * var0.subWidth; + byte[] var2 = class290.SpriteBuffer_pixels[0]; + var0.pixels = new int[var1]; + + for (int var3 = 0; var3 < var1; ++var3) { + var0.pixels[var3] = class268.SpriteBuffer_spritePalette[var2[var3] & 255]; + } + + Message.method1223(); + return var0; + } + + @ObfuscatedName("je") + @ObfuscatedSignature( + signature = "(IIIIIIII)V", + garbageValue = "946172281" + ) + @Export("updateRootInterface") + static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (MusicPatch.loadInterface(var0)) { + WorldMapAreaData.updateInterface(UserComparator7.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); + } + } } diff --git a/runescape-client/src/main/java/BufferedFile.java b/runescape-client/src/main/java/BufferedFile.java index 74c44e3d5d..329587e70e 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("mb") +@ObfuscatedName("my") @Implements("BufferedFile") public class BufferedFile { - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lmd;" + signature = "Lmk;" ) @Export("accessFile") AccessFile accessFile; - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("readBuffer") byte[] readBuffer; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - longValue = 4441824273806734931L + longValue = -5118577974640492239L ) @Export("readBufferOffset") long readBufferOffset; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 2129478493 + intValue = 999715569 ) @Export("readBufferLength") int readBufferLength; - @ObfuscatedName("p") + @ObfuscatedName("b") @Export("writeBuffer") byte[] writeBuffer; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - longValue = -8796048585263914235L + longValue = -7430138866634347913L ) @Export("writeBufferOffset") long writeBufferOffset; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -585871581 + intValue = 1565373677 ) @Export("writeBufferLength") int writeBufferLength; - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedGetter( - longValue = -2340341034582279311L + longValue = -5354612076530734833L ) @Export("offset") long offset; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - longValue = -5942828629537241469L + longValue = -2323016013084465375L ) @Export("fileLength") long fileLength; - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedGetter( - longValue = 2651922969862605519L + longValue = 4889558715252805571L ) @Export("length") long length; - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedGetter( - longValue = 9216989625367163093L + longValue = 7555588731094843747L ) @Export("fileOffset") long fileOffset; @ObfuscatedSignature( - signature = "(Lmd;II)V" + signature = "(Lmk;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("u") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-394540595" + garbageValue = "1595800163" ) @Export("close") public void close() throws IOException { @@ -95,7 +95,7 @@ public class BufferedFile { this.accessFile.close(); } - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("seek") public void seek(long var1) throws IOException { if (var1 < 0L) { @@ -105,30 +105,30 @@ public class BufferedFile { } } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "(B)J", - garbageValue = "-30" + garbageValue = "91" ) @Export("length") public long length() { return this.length; } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "([BI)V", - garbageValue = "-2037969367" + signature = "([BB)V", + garbageValue = "-24" ) @Export("readFully") public void readFully(byte[] var1) throws IOException { this.read(var1, 0, var1.length); } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "([BIII)V", - garbageValue = "2058467153" + signature = "([BIIB)V", + garbageValue = "61" ) @Export("read") public void read(byte[] var1, int var2, int var3) throws IOException { @@ -137,7 +137,7 @@ public class BufferedFile { throw new ArrayIndexOutOfBoundsException(var3 + var2 - var1.length); } - if (-1L != this.writeBufferOffset && this.offset >= this.writeBufferOffset && (long)var3 + this.offset <= (long)this.writeBufferLength + this.writeBufferOffset) { + if (this.writeBufferOffset != -1L && 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; @@ -146,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; @@ -184,7 +184,7 @@ public class BufferedFile { this.offset += (long)var8; } - if (this.writeBufferOffset != -1L) { + if (-1L != this.writeBufferOffset) { if (this.writeBufferOffset > this.offset && var3 > 0) { var8 = var2 + (int)(this.writeBufferOffset - this.offset); if (var8 > var3 + var2) { @@ -200,16 +200,16 @@ public class BufferedFile { long var13 = -1L; long var10 = -1L; - if (this.writeBufferOffset >= var4 && this.writeBufferOffset < (long)var7 + var4) { + if (this.writeBufferOffset >= var4 && this.writeBufferOffset < var4 + (long)var7) { var13 = this.writeBufferOffset; } else if (var4 >= this.writeBufferOffset && var4 < (long)this.writeBufferLength + this.writeBufferOffset) { var13 = var4; } - if ((long)this.writeBufferLength + this.writeBufferOffset > var4 && this.writeBufferOffset + (long)this.writeBufferLength <= (long)var7 + var4) { - var10 = this.writeBufferOffset + (long)this.writeBufferLength; - } else if ((long)var7 + var4 > this.writeBufferOffset && (long)var7 + var4 <= (long)this.writeBufferLength + this.writeBufferOffset) { - var10 = var4 + (long)var7; + if (this.writeBufferOffset + (long)this.writeBufferLength > var4 && this.writeBufferOffset + (long)this.writeBufferLength <= (long)var7 + var4) { + var10 = (long)this.writeBufferLength + this.writeBufferOffset; + } else if ((long)var7 + var4 > this.writeBufferOffset && (long)var7 + var4 <= this.writeBufferOffset + (long)this.writeBufferLength) { + var10 = (long)var7 + var4; } if (var13 > -1L && var10 > var13) { @@ -231,10 +231,10 @@ public class BufferedFile { } } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1188509289" + garbageValue = "1578743019" ) @Export("load") void load() throws IOException { @@ -261,23 +261,23 @@ public class BufferedFile { } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "([BIIS)V", - garbageValue = "13009" + signature = "([BIII)V", + garbageValue = "732073067" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { try { - if ((long)var3 + this.offset > this.length) { - this.length = this.offset + (long)var3; + if (this.offset + (long)var3 > this.length) { + this.length = (long)var3 + this.offset; } if (-1L != this.writeBufferOffset && (this.offset < this.writeBufferOffset || this.offset > this.writeBufferOffset + (long)this.writeBufferLength)) { this.flush(); } - if (-1L != this.writeBufferOffset && (long)var3 + this.offset > (long)this.writeBuffer.length + this.writeBufferOffset) { + if (-1L != this.writeBufferOffset && (long)var3 + this.offset > this.writeBufferOffset + (long)this.writeBuffer.length) { int var4 = (int)((long)this.writeBuffer.length - (this.offset - this.writeBufferOffset)); System.arraycopy(var1, var2, this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var4); this.offset += (long)var4; @@ -289,7 +289,7 @@ public class BufferedFile { if (var3 <= this.writeBuffer.length) { if (var3 > 0) { - if (-1L == this.writeBufferOffset) { + if (this.writeBufferOffset == -1L) { this.writeBufferOffset = this.offset; } @@ -301,7 +301,7 @@ public class BufferedFile { } } else { - if (this.offset != this.fileOffset) { + if (this.fileOffset != this.offset) { this.accessFile.seek(this.offset); this.fileOffset = this.offset; } @@ -320,10 +320,10 @@ public class BufferedFile { var9 = this.readBufferOffset; } - if ((long)var3 + this.offset > this.readBufferOffset && (long)var3 + this.offset <= this.readBufferOffset + (long)this.readBufferLength) { + if (this.offset + (long)var3 > this.readBufferOffset && (long)var3 + this.offset <= this.readBufferOffset + (long)this.readBufferLength) { var6 = this.offset + (long)var3; } else if (this.readBufferOffset + (long)this.readBufferLength > this.offset && (long)this.readBufferLength + this.readBufferOffset <= (long)var3 + this.offset) { - var6 = (long)this.readBufferLength + this.readBufferOffset; + var6 = this.readBufferOffset + (long)this.readBufferLength; } if (var9 > -1L && var6 > var9) { @@ -339,10 +339,10 @@ public class BufferedFile { } } - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "0" + garbageValue = "-37" ) @Export("flush") void flush() throws IOException { @@ -353,23 +353,23 @@ public class BufferedFile { } this.accessFile.write(this.writeBuffer, 0, this.writeBufferLength); - this.fileOffset += (long)(this.writeBufferLength * -520660853) * -585871581L; + this.fileOffset += 1565373677L * (long)(this.writeBufferLength * -466302747); if (this.fileOffset > this.fileLength) { this.fileLength = this.fileOffset; } long var1 = -1L; long var3 = -1L; - if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < (long)this.readBufferLength + this.readBufferOffset) { + if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < this.readBufferOffset + (long)this.readBufferLength) { var1 = this.writeBufferOffset; } else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < (long)this.writeBufferLength + this.writeBufferOffset) { var1 = this.readBufferOffset; } - if ((long)this.writeBufferLength + this.writeBufferOffset > this.readBufferOffset && (long)this.writeBufferLength + this.writeBufferOffset <= this.readBufferOffset + (long)this.readBufferLength) { - var3 = (long)this.writeBufferLength + this.writeBufferOffset; - } else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && this.readBufferOffset + (long)this.readBufferLength <= (long)this.writeBufferLength + this.writeBufferOffset) { - var3 = this.readBufferOffset + (long)this.readBufferLength; + if (this.writeBufferOffset + (long)this.writeBufferLength > this.readBufferOffset && this.writeBufferOffset + (long)this.writeBufferLength <= (long)this.readBufferLength + this.readBufferOffset) { + var3 = this.writeBufferOffset + (long)this.writeBufferLength; + } else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && (long)this.readBufferLength + this.readBufferOffset <= this.writeBufferOffset + (long)this.writeBufferLength) { + var3 = (long)this.readBufferLength + this.readBufferOffset; } if (var1 > -1L && var3 > var1) { diff --git a/runescape-client/src/main/java/BufferedNetSocket.java b/runescape-client/src/main/java/BufferedNetSocket.java index 46d9f56e65..da73f298ed 100644 --- a/runescape-client/src/main/java/BufferedNetSocket.java +++ b/runescape-client/src/main/java/BufferedNetSocket.java @@ -5,19 +5,25 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ki") +@ObfuscatedName("kw") @Implements("BufferedNetSocket") public class BufferedNetSocket extends AbstractSocket { - @ObfuscatedName("u") + @ObfuscatedName("fr") + @ObfuscatedSignature( + signature = "Leo;" + ) + @Export("urlRequester") + static UrlRequester urlRequester; + @ObfuscatedName("f") @Export("socket") Socket socket; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lkt;" + signature = "Lkx;" ) @Export("source") BufferedSource source; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "Lkb;" ) @@ -34,10 +40,10 @@ public class BufferedNetSocket extends AbstractSocket { this.sink = new BufferedSink(this.socket.getOutputStream(), var3); } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-29" + signature = "(I)V", + garbageValue = "-647274291" ) @Export("close") public void close() { @@ -51,50 +57,50 @@ public class BufferedNetSocket extends AbstractSocket { this.source.close(); } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "27" + signature = "(I)I", + garbageValue = "2115277231" ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { return this.source.readUnsignedByte(); } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-53" + signature = "(I)I", + garbageValue = "-972484659" ) @Export("available") public int available() throws IOException { return this.source.available(); } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "-1591428004" + garbageValue = "497635177" ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { return this.source.isAvailable(var1); } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "([BIIB)I", - garbageValue = "29" + signature = "([BIII)I", + garbageValue = "-1642271193" ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { return this.source.read(var1, var2, var3); } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "([BIII)V", - garbageValue = "-543253817" + garbageValue = "-340382115" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { diff --git a/runescape-client/src/main/java/BufferedSink.java b/runescape-client/src/main/java/BufferedSink.java index 7e84199f4c..d286df5276 100644 --- a/runescape-client/src/main/java/BufferedSink.java +++ b/runescape-client/src/main/java/BufferedSink.java @@ -9,37 +9,37 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("kb") @Implements("BufferedSink") public class BufferedSink implements Runnable { - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("thread") Thread thread; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("outputStream") OutputStream outputStream; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 904264235 + intValue = 1559219719 ) @Export("capacity") int capacity; - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("buffer") byte[] buffer; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -566617461 + intValue = -196208499 ) @Export("position") int position; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -217387211 + intValue = 1767380433 ) @Export("limit") int limit; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("exception") IOException exception; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("closed") boolean closed; @@ -54,10 +54,10 @@ public class BufferedSink implements Runnable { this.thread.start(); } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "1508887687" + garbageValue = "649877335" ) @Export("isClosed") boolean isClosed() { @@ -79,10 +79,10 @@ public class BufferedSink implements Runnable { } } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "([BIIB)V", - garbageValue = "-22" + signature = "([BIII)V", + garbageValue = "-1804311851" ) @Export("write") void write(byte[] var1, int var2, int var3) throws IOException { @@ -119,10 +119,10 @@ public class BufferedSink implements Runnable { } } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1435553079" + garbageValue = "1910014350" ) @Export("close") void close() { @@ -197,4 +197,162 @@ public class BufferedSink implements Runnable { } while(!this.isClosed()); } + + @ObfuscatedName("kr") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "1908686960" + ) + @Export("changeGameOptions") + static final void changeGameOptions(int var0) { + Buddy.method5211(); + MouseRecorder.method1187(); + int var1 = UserComparator8.VarpDefinition_get(var0).type; + if (var1 != 0) { + int var2 = Varps.Varps_main[var0]; + if (var1 == 1) { + if (var2 == 1) { + Rasterizer3D.Rasterizer3D_setBrightness(0.9D); + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.9D); + } + + 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); + } + + NetSocket.method3525(); + } + + if (var1 == 3) { + short var3 = 0; + if (var2 == 0) { + var3 = 255; + } + + if (var2 == 1) { + var3 = 192; + } + + if (var2 == 2) { + var3 = 128; + } + + if (var2 == 3) { + var3 = 64; + } + + if (var2 == 4) { + var3 = 0; + } + + if (var3 != Client.musicVolume) { + if (Client.musicVolume == 0 && Client.currentTrackGroupId != -1) { + class173.playMusicTrack(GrandExchangeOfferWorldComparator.archive6, Client.currentTrackGroupId, 0, var3, false); + Client.field767 = false; + } else if (var3 == 0) { + Actor.method1755(); + Client.field767 = false; + } else { + TextureProvider.method2796(var3); + } + + Client.musicVolume = var3; + } + } + + if (var1 == 4) { + if (var2 == 0) { + Client.soundEffectVolume = 127; + } + + if (var2 == 1) { + Client.soundEffectVolume = 96; + } + + if (var2 == 2) { + Client.soundEffectVolume = 64; + } + + if (var2 == 3) { + Client.soundEffectVolume = 32; + } + + if (var2 == 4) { + Client.soundEffectVolume = 0; + } + } + + if (var1 == 5) { + Client.leftClickOpensMenu = var2; + } + + if (var1 == 6) { + Client.chatEffects = var2; + } + + if (var1 == 9) { + Client.field901 = var2; + } + + if (var1 == 10) { + if (var2 == 0) { + Client.areaSoundEffectVolume = 127; + } + + if (var2 == 1) { + Client.areaSoundEffectVolume = 96; + } + + if (var2 == 2) { + Client.areaSoundEffectVolume = 64; + } + + if (var2 == 3) { + Client.areaSoundEffectVolume = 32; + } + + if (var2 == 4) { + Client.areaSoundEffectVolume = 0; + } + } + + if (var1 == 17) { + Client.followerIndex = var2 & 65535; + } + + if (var1 == 18) { + Client.playerAttackOption = (AttackOption)DynamicObject.findEnumerated(ArchiveDisk.method5908(), var2); + if (Client.playerAttackOption == null) { + Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + } + } + + if (var1 == 19) { + if (var2 == -1) { + Client.combatTargetPlayerIndex = -1; + } else { + Client.combatTargetPlayerIndex = var2 & 2047; + } + } + + if (var1 == 22) { + Client.npcAttackOption = (AttackOption)DynamicObject.findEnumerated(ArchiveDisk.method5908(), var2); + if (Client.npcAttackOption == null) { + Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + } + } + + } + } } diff --git a/runescape-client/src/main/java/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java index 4c5873dca5..d6a8a105c9 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("kt") +@ObfuscatedName("kx") @Implements("BufferedSource") public class BufferedSource implements Runnable { - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("thread") Thread thread; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("inputStream") InputStream inputStream; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -290674023 + intValue = 608753777 ) @Export("capacity") int capacity; - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("buffer") byte[] buffer; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1886229969 + intValue = 1571350283 ) @Export("position") int position; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1533965281 + intValue = -1626755739 ) @Export("limit") int limit; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("exception") IOException exception; @@ -52,10 +52,10 @@ public class BufferedSource implements Runnable { this.thread.start(); } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(IB)Z", - garbageValue = "-1" + signature = "(II)Z", + garbageValue = "2103445622" ) @Export("isAvailable") boolean isAvailable(int var1) throws IOException { @@ -86,10 +86,10 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "71" + signature = "(S)I", + garbageValue = "8192" ) @Export("available") int available() throws IOException { @@ -110,10 +110,10 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-245742191" + signature = "(B)I", + garbageValue = "54" ) @Export("readUnsignedByte") int readUnsignedByte() throws IOException { @@ -133,10 +133,10 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "([BIII)I", - garbageValue = "4492631" + garbageValue = "1982977111" ) @Export("read") int read(byte[] var1, int var2, int var3) throws IOException { @@ -174,10 +174,10 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "34" + garbageValue = "-103" ) @Export("close") void close() { @@ -243,4 +243,15 @@ public class BufferedSource implements Runnable { } } } + + @ObfuscatedName("fv") + @ObfuscatedSignature( + signature = "(Lif;Ljava/lang/String;I)V", + garbageValue = "502005158" + ) + static void method5925(Archive var0, String var1) { + ArchiveLoader var2 = new ArchiveLoader(var0, var1); + Client.archiveLoaders.add(var2); + Client.field629 += var2.groupCount; + } } diff --git a/runescape-client/src/main/java/ByteArrayNode.java b/runescape-client/src/main/java/ByteArrayNode.java index 14fbf4cd65..3cb8ff6a49 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("ff") +@ObfuscatedName("gn") @Implements("ByteArrayNode") public class ByteArrayNode extends Node { - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("byteArray") public byte[] byteArray; diff --git a/runescape-client/src/main/java/ByteArrayPool.java b/runescape-client/src/main/java/ByteArrayPool.java index b3b0edcfe5..523ad992b5 100644 --- a/runescape-client/src/main/java/ByteArrayPool.java +++ b/runescape-client/src/main/java/ByteArrayPool.java @@ -4,37 +4,40 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kv") +@ObfuscatedName("kj") @Implements("ByteArrayPool") public class ByteArrayPool { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 153239603 + intValue = -210161975 ) @Export("ByteArrayPool_smallCount") static int ByteArrayPool_smallCount; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -433125971 + intValue = 1380698397 ) @Export("ByteArrayPool_mediumCount") static int ByteArrayPool_mediumCount; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1031778889 + intValue = 750629749 ) @Export("ByteArrayPool_largeCount") static int ByteArrayPool_largeCount; - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("ByteArrayPool_small") static byte[][] ByteArrayPool_small; - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("ByteArrayPool_medium") static byte[][] ByteArrayPool_medium; - @ObfuscatedName("p") + @ObfuscatedName("b") @Export("ByteArrayPool_large") static byte[][] ByteArrayPool_large; - @ObfuscatedName("w") + @ObfuscatedName("e") + @Export("ByteArrayPool_alternativeSizes") + static int[] ByteArrayPool_alternativeSizes; + @ObfuscatedName("a") @Export("ByteArrayPool_arrays") static byte[][][] ByteArrayPool_arrays; @@ -48,9 +51,36 @@ public class ByteArrayPool { } @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "(I[BLkg;B)V", + garbageValue = "107" + ) + static void method5805(int var0, byte[] var1, ArchiveDisk var2) { + ArchiveDiskAction var3 = new ArchiveDiskAction(); + var3.type = 0; + var3.key = (long)var0; + var3.data = var1; + var3.archiveDisk = var2; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); + } + + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { + if (ArchiveDiskActionHandler.field3120 == 0) { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); + } + + ArchiveDiskActionHandler.field3120 = 600; + } + } + + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(IZI)[B", - garbageValue = "-2110348593" + garbageValue = "877934718" ) @Export("ByteArrayPool_getArrayBool") static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean var1) { @@ -83,13 +113,13 @@ public class ByteArrayPool { } if (ByteArrayPool_arrays != null) { - for (int var4 = 0; var4 < WorldMapSprite.ByteArrayPool_alternativeSizes.length; ++var4) { - if (WorldMapSprite.ByteArrayPool_alternativeSizes[var4] != var0) { - if (var0 < WorldMapSprite.ByteArrayPool_alternativeSizes[var4]) { + for (int var4 = 0; var4 < ByteArrayPool_alternativeSizes.length; ++var4) { + if (ByteArrayPool_alternativeSizes[var4] != var0) { + if (var0 < ByteArrayPool_alternativeSizes[var4]) { } - } else if (class216.ByteArrayPool_altSizeArrayCounts[var4] > 0) { - byte[] var3 = ByteArrayPool_arrays[var4][--class216.ByteArrayPool_altSizeArrayCounts[var4]]; - ByteArrayPool_arrays[var4][class216.ByteArrayPool_altSizeArrayCounts[var4]] = null; + } else if (Interpreter.ByteArrayPool_altSizeArrayCounts[var4] > 0) { + byte[] var3 = ByteArrayPool_arrays[var4][--Interpreter.ByteArrayPool_altSizeArrayCounts[var4]]; + ByteArrayPool_arrays[var4][Interpreter.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 661047a338..f5a9fb1b85 100644 --- a/runescape-client/src/main/java/Calendar.java +++ b/runescape-client/src/main/java/Calendar.java @@ -1,23 +1,39 @@ -import java.io.DataInputStream; -import java.net.URL; import java.util.TimeZone; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gf") +@ObfuscatedName("hd") @Implements("Calendar") public class Calendar { - @ObfuscatedName("u") + @ObfuscatedName("pb") + @ObfuscatedSignature( + signature = "Ljq;" + ) + @Export("clanChat") + static ClanChat clanChat; + @ObfuscatedName("pv") + @ObfuscatedSignature( + signature = "Lku;" + ) + @Export("privateChatMode") + static PrivateChatMode privateChatMode; + @ObfuscatedName("f") @Export("MONTH_NAMES_ENGLISH_GERMAN") static final String[][] MONTH_NAMES_ENGLISH_GERMAN; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("DAYS_OF_THE_WEEK") static final String[] DAYS_OF_THE_WEEK; - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("Calendar_calendar") static java.util.Calendar Calendar_calendar; + @ObfuscatedName("bc") + @ObfuscatedSignature( + signature = "[Lls;" + ) + @Export("worldSelectBackSprites") + static Sprite[] worldSelectBackSprites; 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"}}; @@ -26,46 +42,39 @@ public class Calendar { Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT")); } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/Throwable;I)V", - garbageValue = "1722882053" + signature = "(Lkq;Llc;B)Llc;", + garbageValue = "-33" ) - @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 = SpriteMask.method4035(var1); - } + @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); + } - if (var0 != null) { - if (var1 != null) { - var2 = var2 + " | "; - } - - var2 = var2 + var0; - } - - System.out.println("Error: " + var2); - var2 = var2.replace(':', '.'); - var2 = var2.replace('@', '_'); - var2 = var2.replace('&', '_'); - var2 = var2.replace('#', '_'); - if (RunException.RunException_applet == null) { - return; - } - - URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + RunException.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + RunException.clientType + "&e=" + var2); - DataInputStream var4 = new DataInputStream(var3.openStream()); - var4.read(); - var4.close(); - } catch (Exception var5) { + for (var3 = 0; var3 < var2; ++var3) { + boolean var7 = var0.readUnsignedByte() == 1; + int var5 = var0.readMedium(); + Object var6; + if (var7) { + var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); + } else { + var6 = new IntegerNode(var0.readInt()); } + var1.put((Node)var6, (long)var5); } + + return var1; } } diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java index 1f44db588a..3bef7045dc 100644 --- a/runescape-client/src/main/java/Canvas.java +++ b/runescape-client/src/main/java/Canvas.java @@ -1,20 +1,23 @@ import java.awt.Component; import java.awt.Graphics; -import java.net.URL; -import java.util.LinkedHashMap; 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("ax") +@ObfuscatedName("af") @Implements("Canvas") public final class Canvas extends java.awt.Canvas { - @ObfuscatedName("ek") - @Export("worldHost") - static String worldHost; - @ObfuscatedName("u") + @ObfuscatedName("qn") + @ObfuscatedGetter( + intValue = 739574061 + ) + static int field397; + @ObfuscatedName("gk") + @Export("xteaKeys") + static int[][] xteaKeys; + @ObfuscatedName("f") @Export("component") Component component; @@ -30,158 +33,68 @@ public final class Canvas extends java.awt.Canvas { this.component.paint(var1); } - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-1452894334" - ) - @Export("loadWorlds") - static boolean loadWorlds() { - try { - if (GrandExchangeOfferOwnWorldComparator.World_request == null) { - GrandExchangeOfferOwnWorldComparator.World_request = SpriteMask.urlRequester.request(new URL(WallDecoration.field1914)); - } else if (GrandExchangeOfferOwnWorldComparator.World_request.isDone()) { - byte[] var0 = GrandExchangeOfferOwnWorldComparator.World_request.getResponse(); - Buffer var1 = new Buffer(var0); - var1.readInt(); - World.World_count = var1.readUnsignedShort(); - Skills.World_worlds = new World[World.World_count]; - - World var3; - for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { - var3 = Skills.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(); - } - - Clock.sortWorlds(Skills.World_worlds, 0, Skills.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); - GrandExchangeOfferOwnWorldComparator.World_request = null; - return true; - } - } catch (Exception var4) { - var4.printStackTrace(); - GrandExchangeOfferOwnWorldComparator.World_request = null; - } - - return false; - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "(II)Ler;", - garbageValue = "-1118777455" - ) - @Export("getFrames") - static Frames getFrames(int var0) { - Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); - if (var1 != null) { - return var1; - } else { - AbstractArchive var3 = SequenceDefinition.SequenceDefinition_animationsArchive; - AbstractArchive var4 = SequenceDefinition.SequenceDefinition_skeletonsArchive; - boolean var5 = true; - int[] var6 = var3.getGroupFileIds(var0); - - for (int var7 = 0; var7 < var6.length; ++var7) { - byte[] var8 = var3.getFile(var0, var6[var7]); - if (var8 == null) { - var5 = false; - } else { - int var9 = (var8[0] & 255) << 8 | var8[1] & 255; - byte[] var10 = var4.getFile(var9, 0); - if (var10 == null) { - var5 = false; - } - } - } - - Frames var2; - if (!var5) { - var2 = null; - } else { - try { - var2 = new Frames(var3, var4, var0, false); - } catch (Exception var12) { - var2 = null; - } - } - - if (var2 != null) { - SequenceDefinition.SequenceDefinition_cachedFrames.put(var2, (long)var0); - } - - return var2; - } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "(ILci;ZB)I", + signature = "(IIIIB)V", garbageValue = "-7" ) - static int method873(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? Interpreter.field1090 : class188.field2352; - if (var0 == ScriptOpcodes.CC_GETX) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.x; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETY) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.y; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.width; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.height; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETHIDE) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETLAYER) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.parentId; - return 1; - } else { - return 2; + @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); } - } - @ObfuscatedName("ap") - @ObfuscatedSignature( - signature = "(ILhx;ZB)V", - garbageValue = "0" - ) - static void method871(int var0, Coord var1, boolean var2) { - WorldMapArea var3 = Clock.getWorldMap().getMapArea(var0); - int var4 = class215.localPlayer.plane; - int var5 = class51.baseX * 64 + (class215.localPlayer.x >> 7); - int var6 = VarcInt.baseY * 64 + (class215.localPlayer.y >> 7); - Coord var7 = new Coord(var4, var5, var6); - Clock.getWorldMap().method6453(var3, var7, var1, var2); - } + if (var4.ids.length <= var1) { + int[] var5 = new int[var1 + 1]; + int[] var6 = new int[var1 + 1]; - @ObfuscatedName("fo") - @ObfuscatedSignature( - signature = "(ZB)V", - garbageValue = "-90" - ) - static final void method872(boolean var0) { - if (var0) { - Client.field680 = Login.field1196 ? class160.field2008 : class160.field2005; - } else { - LinkedHashMap var1 = UserComparator10.clientPreferences.parameters; - String var3 = Login.Login_username; - int var4 = var3.length(); - int var5 = 0; - - for (int var6 = 0; var6 < var4; ++var6) { - var5 = (var5 << 5) - var5 + var3.charAt(var6); + int var7; + for (var7 = 0; var7 < var4.ids.length; ++var7) { + var5[var7] = var4.ids[var7]; + var6[var7] = var4.quantities[var7]; } - Client.field680 = var1.containsKey(var5) ? class160.field2009 : class160.field2006; + 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("p") + @ObfuscatedSignature( + signature = "(Lhz;Ljava/lang/String;Ljava/lang/String;I)Lli;", + garbageValue = "-1768952191" + ) + @Export("SpriteBuffer_getIndexedSpriteByName") + public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); + int var4 = var0.getFileId(var3, var2); + IndexedSprite var5; + if (!HitSplatDefinition.method4586(var0, var3, var4)) { + var5 = null; + } else { + var5 = WorldMapDecoration.method327(); + } + + return var5; + } + + @ObfuscatedName("ey") + @ObfuscatedSignature( + signature = "(I)Lld;", + garbageValue = "-228805350" + ) + @Export("getWorldMap") + static WorldMap getWorldMap() { + return GrandExchangeEvent.worldMap; } } diff --git a/runescape-client/src/main/java/ChatChannel.java b/runescape-client/src/main/java/ChatChannel.java index ee84696016..a6bc4b1fa2 100644 --- a/runescape-client/src/main/java/ChatChannel.java +++ b/runescape-client/src/main/java/ChatChannel.java @@ -4,18 +4,24 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cs") +@ObfuscatedName("ct") @Implements("ChatChannel") public class ChatChannel { - @ObfuscatedName("f") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "[Lba;" + signature = "Lcz;" + ) + @Export("pcmPlayerProvider") + static class97 pcmPlayerProvider; + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "[Lbs;" ) @Export("messages") Message[] messages; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -2111791625 + intValue = 510013085 ) @Export("count") int count; @@ -24,10 +30,10 @@ public class ChatChannel { this.messages = new Message[100]; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lba;", - garbageValue = "1583297440" + signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lbs;", + garbageValue = "481031645" ) @Export("addMessage") Message addMessage(int var1, String var2, String var3, String var4) { @@ -55,41 +61,94 @@ public class ChatChannel { return var5; } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IB)Lba;", - garbageValue = "-6" + signature = "(II)Lbs;", + garbageValue = "-2132499563" ) @Export("getMessage") Message getMessage(int var1) { return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "0" + signature = "(I)I", + garbageValue = "134905957" ) @Export("size") int size() { return this.count; } - @ObfuscatedName("ll") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1059026202" + signature = "(II)Ljava/lang/String;", + garbageValue = "1959752215" ) - static void method2274() { - if (InvDefinition.field3210 != null) { - Client.field863 = Client.cycle; - InvDefinition.field3210.method4403(); + static String method2269(int var0) { + return ""; + } - for (int var0 = 0; var0 < Client.players.length; ++var0) { - if (Client.players[var0] != null) { - InvDefinition.field3210.method4406(class51.baseX * 64 + (Client.players[var0].x >> 7), VarcInt.baseY * 64 + (Client.players[var0].y >> 7)); - } - } + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(III)V", + garbageValue = "-2136093779" + ) + public static void method2259(int var0, int var1) { + VarbitDefinition var2 = UserComparator9.method3319(var0); + int var3 = var2.baseVar; + int var4 = var2.startBit; + int var5 = var2.endBit; + int var6 = Varps.Varps_masks[var5 - var4]; + if (var1 < 0 || var1 > var6) { + var1 = 0; + } + + var6 <<= var4; + Varps.Varps_main[var3] = Varps.Varps_main[var3] & ~var6 | var1 << var4 & var6; + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "(B)Lbe;", + garbageValue = "90" + ) + @Export("worldListStart") + static World worldListStart() { + World.World_listCount = 0; + return Friend.getNextWorldListWorld(); + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "([BI)Lko;", + garbageValue = "65535" + ) + static Font method2270(byte[] var0) { + if (var0 == null) { + return null; + } else { + Font var1 = new Font(var0, class325.SpriteBuffer_xOffsets, class325.SpriteBuffer_yOffsets, UserComparator1.SpriteBuffer_spriteWidths, class325.SpriteBuffer_spriteHeights, class268.SpriteBuffer_spritePalette, class290.SpriteBuffer_pixels); + Message.method1223(); + return var1; + } + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + signature = "(Ldl;B)V", + garbageValue = "21" + ) + @Export("PcmStream_disable") + static final void PcmStream_disable(PcmStream var0) { + var0.active = false; + if (var0.sound != null) { + var0.sound.position = 0; + } + + for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { + PcmStream_disable(var1); } } diff --git a/runescape-client/src/main/java/ClanChat.java b/runescape-client/src/main/java/ClanChat.java index 295adc0848..f3d20beca2 100644 --- a/runescape-client/src/main/java/ClanChat.java +++ b/runescape-client/src/main/java/ClanChat.java @@ -4,104 +4,114 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jg") +@ObfuscatedName("jq") @Implements("ClanChat") public class ClanChat extends UserList { - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Llg;" + signature = "Lll;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "Ljv;" ) @Export("localUser") final Usernamed localUser; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("name") public String name; - @ObfuscatedName("k") + @ObfuscatedName("c") @Export("owner") public String owner; - @ObfuscatedName("x") + @ObfuscatedName("o") @Export("minKick") public byte minKick; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 591163035 + intValue = 208405129 ) @Export("rank") public int rank; - @ObfuscatedName("e") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1630154821 + intValue = -1142922895 ) - int field3639; + int field3614; @ObfuscatedSignature( - signature = "(Llg;Ljv;)V" + signature = "(Lll;Ljv;)V" ) public ClanChat(LoginType var1, Usernamed var2) { super(100); this.name = null; this.owner = null; - this.field3639 = 1; + this.field3614 = 1; this.loginType = var1; this.localUser = var2; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(I)Ljr;", - garbageValue = "-1592540968" + signature = "(B)Ljy;", + garbageValue = "68" ) @Export("newInstance") User newInstance() { return new ClanMate(); } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IB)[Ljr;", - garbageValue = "-122" + signature = "(IB)[Ljy;", + garbageValue = "32" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new ClanMate[var1]; } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "(Ljava/lang/String;I)V", - garbageValue = "1093647998" + garbageValue = "505839882" ) @Export("readName") final void readName(String var1) { - this.name = GrandExchangeOfferTotalQuantityComparator.method97(var1); + String var3 = CollisionMap.base37DecodeLong(class226.method4101(var1)); + if (var3 == null) { + var3 = ""; + } + + this.name = var3; } - @ObfuscatedName("o") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", - garbageValue = "77" + signature = "(Ljava/lang/String;I)V", + garbageValue = "1040645085" ) @Export("setOwner") final void setOwner(String var1) { - this.owner = GrandExchangeOfferTotalQuantityComparator.method97(var1); + String var3 = CollisionMap.base37DecodeLong(class226.method4101(var1)); + if (var3 == null) { + var3 = ""; + } + + this.owner = var3; } - @ObfuscatedName("e") + @ObfuscatedName("cg") @ObfuscatedSignature( - signature = "(Lkg;I)V", - garbageValue = "2029148344" + signature = "(Lkq;I)V", + garbageValue = "171385473" ) @Export("readUpdate") public final void readUpdate(Buffer var1) { this.setOwner(var1.readStringCp1252NullTerminated()); long var2 = var1.readLong(); - this.readName(SpriteMask.method4038(var2)); + this.readName(WorldMapIcon_0.method201(var2)); this.minKick = var1.readByte(); int var4 = var1.readUnsignedByte(); if (var4 != 255) { @@ -110,7 +120,7 @@ public class ClanChat extends UserList { 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.field3639 - 1); + var6.set(var7, ++this.field3614 - 1); var6.rank = var1.readByte(); var1.readStringCp1252NullTerminated(); this.isLocalPlayer(var6); @@ -119,12 +129,12 @@ public class ClanChat extends UserList { } } - @ObfuscatedName("cr") + @ObfuscatedName("ct") @ObfuscatedSignature( - signature = "(Lkg;I)V", - garbageValue = "1670981116" + signature = "(Lkq;I)V", + garbageValue = "-1031148737" ) - public final void method5329(Buffer var1) { + public final void method5262(Buffer var1) { Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); int var3 = var1.readUnsignedShort(); byte var4 = var1.readByte(); @@ -154,17 +164,17 @@ public class ClanChat extends UserList { var6 = (ClanMate)this.addLastNoPreviousUsername(var2); } - var6.set(var3, ++this.field3639 - 1); + var6.set(var3, ++this.field3614 - 1); var6.rank = var4; this.isLocalPlayer(var6); } } - @ObfuscatedName("ck") + @ObfuscatedName("cr") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "327438402" + garbageValue = "-1039852282" ) @Export("clearFriends") public final void clearFriends() { @@ -174,10 +184,10 @@ public class ClanChat extends UserList { } - @ObfuscatedName("cb") + @ObfuscatedName("cy") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "83" + garbageValue = "32" ) @Export("invalidateIgnoreds") public final void invalidateIgnoreds() { @@ -187,10 +197,10 @@ public class ClanChat extends UserList { } - @ObfuscatedName("cy") + @ObfuscatedName("cz") @ObfuscatedSignature( - signature = "(Ljs;I)V", - garbageValue = "-2081381015" + signature = "(Ljd;I)V", + garbageValue = "667645943" ) @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 282c6bdfe1..a180ebb57b 100644 --- a/runescape-client/src/main/java/ClanMate.java +++ b/runescape-client/src/main/java/ClanMate.java @@ -1,20 +1,31 @@ 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("js") +@ObfuscatedName("jd") @Implements("ClanMate") public class ClanMate extends Buddy { - @ObfuscatedName("u") + @ObfuscatedName("ex") + @ObfuscatedGetter( + intValue = -1283772433 + ) + static int field3566; + @ObfuscatedName("fm") + @ObfuscatedGetter( + intValue = 1387790873 + ) + static int field3567; + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lja;" + signature = "Ljf;" ) @Export("friend") TriBool friend; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lja;" + signature = "Ljf;" ) @Export("ignored") TriBool ignored; @@ -24,20 +35,20 @@ public class ClanMate extends Buddy { this.ignored = TriBool.TriBool_unknown; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-186118944" + garbageValue = "1521819508" ) @Export("clearIsFriend") void clearIsFriend() { this.friend = TriBool.TriBool_unknown; } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1867763200" + garbageValue = "2007555671" ) @Export("isFriend") public final boolean isFriend() { @@ -48,30 +59,30 @@ public class ClanMate extends Buddy { return this.friend == TriBool.TriBool_true; } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "1" + signature = "(I)V", + garbageValue = "-1569748469" ) @Export("fillIsFriend") void fillIsFriend() { - this.friend = VertexNormal.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.friend = Message.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "1" + signature = "(S)V", + garbageValue = "3103" ) @Export("clearIsIgnored") void clearIsIgnored() { this.ignored = TriBool.TriBool_unknown; } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1504737045" + garbageValue = "-732818208" ) @Export("isIgnored") public final boolean isIgnored() { @@ -82,13 +93,40 @@ public class ClanMate extends Buddy { return this.ignored == TriBool.TriBool_true; } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1422306006" + garbageValue = "-1631625166" ) @Export("fillIsIgnored") void fillIsIgnored() { - this.ignored = VertexNormal.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.ignored = Message.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + } + + @ObfuscatedName("jp") + @ObfuscatedSignature( + signature = "(IIIIII)V", + garbageValue = "2022495737" + ) + @Export("drawScrollBar") + static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { + class60.scrollBarSprites[0].drawAt(var0, var1); + class60.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field691); + int var5 = var3 * (var3 - 32) / var4; + if (var5 < 8) { + var5 = 8; + } + + int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field692); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field694); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field694); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field694); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field694); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field693); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field693); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var5 + var6 + var1 + 15, 16, Client.field693); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field693); } } diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index e95c088ad8..7eeccb4ce8 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -1,1268 +1,1271 @@ -import java.io.File; import java.io.IOException; -import java.io.RandomAccessFile; import java.net.Socket; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; -import java.util.LinkedHashMap; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import netscape.javascript.JSObject; @Implements("Client") @ObfuscatedName("client") public final class Client extends GameShell implements Usernamed { - @ObfuscatedName("mw") + @ObfuscatedName("mu") @ObfuscatedSignature( - signature = "Lhl;" + signature = "Lha;" ) @Export("clickedWidget") static Widget clickedWidget; - @ObfuscatedName("oj") + @ObfuscatedName("ov") @ObfuscatedGetter( - intValue = 228290229 + intValue = -880923057 + ) + static int field832; + @ObfuscatedName("og") + @ObfuscatedGetter( + intValue = -405077157 ) @Export("rootWidgetCount") static int rootWidgetCount; - @ObfuscatedName("ok") - @ObfuscatedGetter( - intValue = 986793503 - ) - static int field690; - @ObfuscatedName("os") - @ObfuscatedGetter( - longValue = -7754540937541537763L - ) - static long field652; @ObfuscatedName("oa") - static boolean[] field847; - @ObfuscatedName("ob") - static boolean[] field849; - @ObfuscatedName("ov") - static boolean[] field837; - @ObfuscatedName("ne") - static boolean field823; - @ObfuscatedName("of") - @Export("isResizable") - static boolean isResizable; - @ObfuscatedName("nl") @ObfuscatedGetter( - intValue = 1560570297 + longValue = 6996967877064872553L + ) + static long field841; + @ObfuscatedName("os") + static boolean[] field833; + @ObfuscatedName("ok") + static boolean[] field834; + @ObfuscatedName("on") + static boolean[] field835; + @ObfuscatedName("ni") + static boolean field809; + @ObfuscatedName("nc") + @ObfuscatedGetter( + intValue = -1405704491 ) @Export("cycleCntr") static int cycleCntr; - @ObfuscatedName("nc") + @ObfuscatedName("ot") + @Export("isResizable") + static boolean isResizable; + @ObfuscatedName("nt") @ObfuscatedGetter( - intValue = -796800237 + intValue = -1225978651 ) - static int field833; - @ObfuscatedName("si") + static int field711; + @ObfuscatedName("sc") @ObfuscatedGetter( - intValue = -957842515 + intValue = -1513063055 ) - public static int field863; - @ObfuscatedName("nm") - static boolean field820; + public static int field749; + @ObfuscatedName("nh") + static boolean field806; @ObfuscatedName("qt") - static boolean field742; - @ObfuscatedName("ml") + static boolean field767; + @ObfuscatedName("mm") @ObfuscatedGetter( - intValue = -944462791 + intValue = -733462179 ) @Export("widgetClickX") static int widgetClickX; - @ObfuscatedName("me") + @ObfuscatedName("mx") @ObfuscatedGetter( - intValue = -1327051591 + intValue = 1296654555 ) @Export("widgetClickY") static int widgetClickY; - @ObfuscatedName("nd") + @ObfuscatedName("no") @ObfuscatedGetter( - intValue = -1892868949 + intValue = 265525087 ) - static int field698; - @ObfuscatedName("oy") + static int field807; + @ObfuscatedName("oo") @ObfuscatedSignature( signature = "Lle;" ) @Export("widgetClickMasks") static NodeHashTable widgetClickMasks; - @ObfuscatedName("mp") + @ObfuscatedName("mo") @ObfuscatedSignature( - signature = "Lhl;" + signature = "Lha;" ) @Export("clickedWidgetParent") static Widget clickedWidgetParent; - @ObfuscatedName("ow") + @ObfuscatedName("oz") @Export("rootWidgetWidths") static int[] rootWidgetWidths; - @ObfuscatedName("mq") + @ObfuscatedName("ma") @ObfuscatedSignature( signature = "Lle;" ) @Export("interfaceParents") static NodeHashTable interfaceParents; - @ObfuscatedName("on") + @ObfuscatedName("ow") @Export("rootWidgetXs") static int[] rootWidgetXs; - @ObfuscatedName("nh") + @ObfuscatedName("nm") @ObfuscatedGetter( - intValue = -1392572657 + intValue = 1203464941 ) - static int field822; + static int field808; @ObfuscatedName("mc") @ObfuscatedSignature( - signature = "Lhl;" + signature = "Lha;" ) @Export("viewportWidget") static Widget viewportWidget; - @ObfuscatedName("oe") + @ObfuscatedName("ou") @ObfuscatedGetter( - intValue = -311062333 + intValue = -2063650301 ) @Export("gameDrawingMode") static int gameDrawingMode; - @ObfuscatedName("oh") + @ObfuscatedName("oq") @Export("rootWidgetHeights") static int[] rootWidgetHeights; - @ObfuscatedName("ms") + @ObfuscatedName("mt") @ObfuscatedGetter( - intValue = -1520316987 + intValue = -1570996335 ) @Export("staffModLevel") - static int staffModLevel; - @ObfuscatedName("ol") + public static int staffModLevel; + @ObfuscatedName("ts") + @ObfuscatedSignature( + signature = "Lba;" + ) + static final class65 field902; + @ObfuscatedName("oi") @Export("rootWidgetYs") static int[] rootWidgetYs; - @ObfuscatedName("tv") - static int[] field916; - @ObfuscatedName("tx") - static int[] field862; - @ObfuscatedName("tp") - @ObfuscatedSignature( - signature = "Lbb;" - ) - static final class65 field915; - @ObfuscatedName("or") - @ObfuscatedSignature( - signature = "Ljd;" - ) - @Export("scriptEvents") - static NodeDeque scriptEvents; - @ObfuscatedName("ni") - @ObfuscatedGetter( - intValue = -463811251 - ) - static int field808; - @ObfuscatedName("no") - @ObfuscatedGetter( - intValue = 414578091 - ) - static int field825; - @ObfuscatedName("px") - @ObfuscatedGetter( - intValue = -731611885 - ) - @Export("destinationX") - static int destinationX; - @ObfuscatedName("pn") - @ObfuscatedGetter( - intValue = 16541371 - ) - @Export("destinationY") - static int destinationY; - @ObfuscatedName("na") - static int[] field828; - @ObfuscatedName("nr") - @ObfuscatedGetter( - intValue = -2117192957 - ) - static int field829; - @ObfuscatedName("nv") - @Export("isDraggingWidget") - static boolean isDraggingWidget; - @ObfuscatedName("nf") - @Export("changedItemContainers") - static int[] changedItemContainers; - @ObfuscatedName("mv") - @ObfuscatedGetter( - intValue = -660424691 - ) - @Export("runEnergy") - static int runEnergy; - @ObfuscatedName("ng") - @ObfuscatedGetter( - intValue = 1845259309 - ) - static int field898; - @ObfuscatedName("my") - @ObfuscatedGetter( - intValue = 557453795 - ) - @Export("weight") - static int weight; - @ObfuscatedName("mg") - @ObfuscatedSignature( - signature = "Lhl;" - ) - @Export("meslayerContinueWidget") - static Widget meslayerContinueWidget; - @ObfuscatedName("op") - @ObfuscatedGetter( - intValue = -735804001 - ) - @Export("mouseWheelRotation") - static int mouseWheelRotation; - @ObfuscatedName("nu") - @Export("changedSkills") - static int[] changedSkills; - @ObfuscatedName("nz") - @ObfuscatedGetter( - intValue = -485415327 - ) - @Export("changedSkillsCount") - static int changedSkillsCount; - @ObfuscatedName("sf") - @ObfuscatedGetter( - intValue = 1362250675 - ) - static int field906; - @ObfuscatedName("rk") - @ObfuscatedSignature( - signature = "Lhd;" - ) - @Export("playerAppearance") - static PlayerAppearance playerAppearance; - @ObfuscatedName("qr") - @ObfuscatedGetter( - intValue = -412348325 - ) - @Export("areaSoundEffectVolume") - static int areaSoundEffectVolume; @ObfuscatedName("ql") @ObfuscatedGetter( - intValue = 1577720607 - ) - @Export("soundEffectCount") - static int soundEffectCount; - @ObfuscatedName("sm") - @ObfuscatedGetter( - intValue = -1100705823 - ) - static int field907; - @ObfuscatedName("mj") - @ObfuscatedSignature( - signature = "Lhl;" - ) - @Export("draggedOnWidget") - static Widget draggedOnWidget; - @ObfuscatedName("qs") - @Export("soundEffectIds") - static int[] soundEffectIds; - @ObfuscatedName("qa") - @Export("queuedSoundEffectLoops") - static int[] queuedSoundEffectLoops; - @ObfuscatedName("qv") - @Export("queuedSoundEffectDelays") - static int[] queuedSoundEffectDelays; - @ObfuscatedName("qj") - @ObfuscatedGetter( - intValue = 350468397 - ) - @Export("musicVolume") - static int musicVolume; - @ObfuscatedName("qe") - @ObfuscatedSignature( - signature = "[Lcz;" - ) - @Export("soundEffects") - static SoundEffect[] soundEffects; - @ObfuscatedName("sq") - @Export("archiveLoaders") - static ArrayList archiveLoaders; - @ObfuscatedName("qq") - @ObfuscatedGetter( - intValue = -857958987 + intValue = -731795947 ) @Export("currentTrackGroupId") static int currentTrackGroupId; - @ObfuscatedName("qd") - @Export("soundLocations") - static int[] soundLocations; - @ObfuscatedName("sk") - @ObfuscatedGetter( - intValue = -1151595097 + @ObfuscatedName("op") + @ObfuscatedSignature( + signature = "Ljs;" ) - @Export("archiveLoadersDone") - static int archiveLoadersDone; - @ObfuscatedName("qn") + @Export("scriptEvents") + static NodeDeque scriptEvents; + @ObfuscatedName("pj") @ObfuscatedGetter( - intValue = 1053015149 + intValue = 1081160319 + ) + @Export("destinationX") + static int destinationX; + @ObfuscatedName("ng") + @ObfuscatedGetter( + intValue = 1476822695 + ) + static int field882; + @ObfuscatedName("qc") + @ObfuscatedGetter( + intValue = 1145130111 + ) + @Export("musicVolume") + static int musicVolume; + @ObfuscatedName("pd") + @ObfuscatedGetter( + intValue = 810038281 + ) + @Export("destinationY") + static int destinationY; + @ObfuscatedName("nk") + @ObfuscatedGetter( + intValue = -1107460421 + ) + static int field811; + @ObfuscatedName("tr") + static int[] field903; + @ObfuscatedName("tb") + static int[] field730; + @ObfuscatedName("ne") + static int[] field814; + @ObfuscatedName("nv") + @ObfuscatedGetter( + intValue = 1654772915 + ) + static int field648; + @ObfuscatedName("qe") + @ObfuscatedGetter( + intValue = -1501062623 ) @Export("minimapState") static int minimapState; - @ObfuscatedName("qw") - @Export("isCameraLocked") - static boolean isCameraLocked; - @ObfuscatedName("qb") + @ObfuscatedName("nj") + @Export("isDraggingWidget") + static boolean isDraggingWidget; + @ObfuscatedName("mi") @ObfuscatedGetter( - intValue = 1255558445 + intValue = -883981411 + ) + @Export("runEnergy") + static int runEnergy; + @ObfuscatedName("mq") + @ObfuscatedGetter( + intValue = 601999387 + ) + @Export("weight") + static int weight; + @ObfuscatedName("sv") + @ObfuscatedGetter( + intValue = -1907588415 + ) + static int field893; + @ObfuscatedName("rh") + @ObfuscatedSignature( + signature = "Lhh;" + ) + @Export("playerAppearance") + static PlayerAppearance playerAppearance; + @ObfuscatedName("qh") + @ObfuscatedGetter( + intValue = 1772801815 + ) + @Export("areaSoundEffectVolume") + static int areaSoundEffectVolume; + @ObfuscatedName("sm") + @ObfuscatedGetter( + intValue = -308750649 + ) + static int field894; + @ObfuscatedName("mw") + @ObfuscatedSignature( + signature = "Lha;" + ) + @Export("draggedOnWidget") + static Widget draggedOnWidget; + @ObfuscatedName("om") + @ObfuscatedGetter( + intValue = -414027891 + ) + @Export("mouseWheelRotation") + static int mouseWheelRotation; + @ObfuscatedName("nq") + @ObfuscatedGetter( + intValue = -1985880681 + ) + static int field825; + @ObfuscatedName("qk") + @ObfuscatedGetter( + intValue = -1182860481 ) @Export("soundEffectVolume") static int soundEffectVolume; - @ObfuscatedName("re") - static boolean[] field835; - @ObfuscatedName("ra") - static int[] field736; - @ObfuscatedName("rs") - static int[] field901; - @ObfuscatedName("ri") - static int[] field890; - @ObfuscatedName("rx") - static int[] field891; - @ObfuscatedName("mm") + @ObfuscatedName("qp") + @Export("isCameraLocked") + static boolean isCameraLocked; + @ObfuscatedName("sk") + @Export("archiveLoaders") + static ArrayList archiveLoaders; + @ObfuscatedName("qx") @ObfuscatedGetter( - intValue = -1297477089 + intValue = 413353821 + ) + @Export("soundEffectCount") + static int soundEffectCount; + @ObfuscatedName("np") + @Export("changedSkills") + static int[] changedSkills; + @ObfuscatedName("qm") + @Export("soundEffectIds") + static int[] soundEffectIds; + @ObfuscatedName("sx") + @ObfuscatedGetter( + intValue = 83394787 + ) + @Export("archiveLoadersDone") + static int archiveLoadersDone; + @ObfuscatedName("rj") + static boolean[] field779; + @ObfuscatedName("nu") + @ObfuscatedGetter( + intValue = 1316268697 + ) + @Export("changedSkillsCount") + static int changedSkillsCount; + @ObfuscatedName("pp") + @ObfuscatedGetter( + intValue = -1130941139 + ) + static int field853; + @ObfuscatedName("qj") + @Export("queuedSoundEffectLoops") + static int[] queuedSoundEffectLoops; + @ObfuscatedName("qz") + @Export("queuedSoundEffectDelays") + static int[] queuedSoundEffectDelays; + @ObfuscatedName("mn") + @ObfuscatedGetter( + intValue = -1572396161 ) @Export("chatEffects") static int chatEffects; - @ObfuscatedName("pu") - static long[] field861; - @ObfuscatedName("pp") - @ObfuscatedGetter( - intValue = -1561057363 - ) - static int field867; - @ObfuscatedName("mx") - @ObfuscatedGetter( - intValue = -1459895255 - ) - static int field807; - @ObfuscatedName("sl") + @ObfuscatedName("qf") @ObfuscatedSignature( - signature = "Llh;" + signature = "[Lcl;" ) - @Export("platformInfoProvider") - static PlatformInfoProvider platformInfoProvider; - @ObfuscatedName("pb") + @Export("soundEffects") + static SoundEffect[] soundEffects; + @ObfuscatedName("mr") @ObfuscatedGetter( - intValue = 590028811 + intValue = 2013132005 ) - static int field855; - @ObfuscatedName("rw") - static short field880; - @ObfuscatedName("rn") - static short field893; - @ObfuscatedName("rf") - static short field785; - @ObfuscatedName("nb") + static int field901; + @ObfuscatedName("ps") @ObfuscatedGetter( - intValue = 880355845 + longValue = 5997092609949214729L ) - static int field834; - @ObfuscatedName("ru") - static short field679; - @ObfuscatedName("rv") - static short field897; - @ObfuscatedName("rr") - @ObfuscatedGetter( - intValue = -766521235 + static long field852; + @ObfuscatedName("qw") + @Export("soundLocations") + static int[] soundLocations; + @ObfuscatedName("mv") + @ObfuscatedSignature( + signature = "Lha;" ) - @Export("viewportZoom") - static int viewportZoom; - @ObfuscatedName("rz") - static short field896; - @ObfuscatedName("mt") + @Export("meslayerContinueWidget") + static Widget meslayerContinueWidget; + @ObfuscatedName("si") + @ObfuscatedSignature( + signature = "[Ld;" + ) + @Export("grandExchangeOffers") + static GrandExchangeOffer[] grandExchangeOffers; + @ObfuscatedName("na") @ObfuscatedGetter( - intValue = 1669925739 + intValue = 2032426333 + ) + static int field823; + @ObfuscatedName("mh") + @ObfuscatedGetter( + intValue = 48387723 ) @Export("followerIndex") static int followerIndex; - @ObfuscatedName("py") + @ObfuscatedName("pz") @ObfuscatedGetter( - intValue = -1526497235 + intValue = -1325828335 ) @Export("mapIconCount") static int mapIconCount; - @ObfuscatedName("ro") + @ObfuscatedName("ny") @ObfuscatedGetter( - intValue = 1417358417 + intValue = -2121721263 + ) + static int field862; + @ObfuscatedName("sq") + @ObfuscatedSignature( + signature = "Lly;" + ) + @Export("platformInfoProvider") + static PlatformInfoProvider platformInfoProvider; + @ObfuscatedName("rx") + static short field879; + @ObfuscatedName("rt") + static short field880; + @ObfuscatedName("rl") + static short field804; + @ObfuscatedName("pf") + @Export("mapIconXs") + static int[] mapIconXs; + @ObfuscatedName("ri") + static short field886; + @ObfuscatedName("rn") + static short field884; + @ObfuscatedName("rk") + @ObfuscatedGetter( + intValue = -1174260245 + ) + @Export("viewportZoom") + static int viewportZoom; + @ObfuscatedName("rd") + static short field796; + @ObfuscatedName("rv") + @ObfuscatedGetter( + intValue = -1637393507 ) @Export("viewportWidth") static int viewportWidth; - @ObfuscatedName("pw") - @Export("mapIconXs") - static int[] mapIconXs; - @ObfuscatedName("pq") + @ObfuscatedName("py") @Export("mapIconYs") static int[] mapIconYs; - @ObfuscatedName("pd") + @ObfuscatedName("px") @ObfuscatedSignature( - signature = "[Lln;" + signature = "[Lls;" ) @Export("mapIcons") static Sprite[] mapIcons; - @ObfuscatedName("rj") + @ObfuscatedName("rg") @ObfuscatedGetter( - intValue = -1082228789 + intValue = 312765867 ) @Export("viewportHeight") static int viewportHeight; - @ObfuscatedName("ry") + @ObfuscatedName("nr") + @Export("changedItemContainers") + static int[] changedItemContainers; + @ObfuscatedName("ns") @ObfuscatedGetter( - intValue = -668988237 + intValue = -2138189623 + ) + static int field701; + @ObfuscatedName("rz") + @ObfuscatedGetter( + intValue = 1559591419 ) @Export("viewportOffsetX") static int viewportOffsetX; - @ObfuscatedName("pv") + @ObfuscatedName("ru") @ObfuscatedGetter( - longValue = -417631311892860553L - ) - static long field866; - @ObfuscatedName("rt") - @ObfuscatedGetter( - intValue = 885622525 + intValue = -1657218597 ) @Export("viewportOffsetY") static int viewportOffsetY; - @ObfuscatedName("su") + @ObfuscatedName("ra") @ObfuscatedGetter( - intValue = -352497469 + intValue = -1958895977 ) - static int field914; - @ObfuscatedName("mu") - @Export("playerMod") - static boolean playerMod; - @ObfuscatedName("pg") + static int field873; + @ObfuscatedName("pm") @ObfuscatedGetter( - intValue = 1090044339 - ) - static int field889; - @ObfuscatedName("nt") - @ObfuscatedGetter( - intValue = -1961048311 - ) - static int field836; - @ObfuscatedName("nx") - @ObfuscatedGetter( - intValue = -375047505 - ) - @Export("chatCycle") - static int chatCycle; - @ObfuscatedName("pl") - static int[] field865; - @ObfuscatedName("pt") - static int[] field864; - @ObfuscatedName("oo") - @ObfuscatedSignature( - signature = "Ljd;" - ) - static NodeDeque field900; - @ObfuscatedName("rb") - @Export("zoomHeight") - static short zoomHeight; - @ObfuscatedName("rd") - @Export("zoomWidth") - static short zoomWidth; - @ObfuscatedName("oq") - @ObfuscatedSignature( - signature = "Ljd;" - ) - static NodeDeque field843; - @ObfuscatedName("nq") - @ObfuscatedGetter( - intValue = -42064155 - ) - static int field734; - @ObfuscatedName("mk") - @ObfuscatedGetter( - intValue = -404795193 - ) - static int field804; - @ObfuscatedName("mn") - @ObfuscatedGetter( - intValue = -305198765 - ) - static int field805; - @ObfuscatedName("pj") - @ObfuscatedGetter( - intValue = 1916921629 + intValue = -226076741 ) @Export("publicChatMode") static int publicChatMode; @ObfuscatedName("pk") @ObfuscatedGetter( - intValue = 205603533 + intValue = 765110439 ) @Export("tradeChatMode") static int tradeChatMode; - @ObfuscatedName("sv") - @ObfuscatedSignature( - signature = "[Li;" - ) - @Export("grandExchangeOffers") - static GrandExchangeOffer[] grandExchangeOffers; - @ObfuscatedName("ny") + @ObfuscatedName("pr") @ObfuscatedGetter( - intValue = -24326817 + intValue = -255532007 ) - static int field645; - @ObfuscatedName("pa") - static int[] field857; - @ObfuscatedName("ph") - static String field860; - @ObfuscatedName("sh") + static int field849; + @ObfuscatedName("nz") + @ObfuscatedGetter( + intValue = -2038569335 + ) + static int field860; + @ObfuscatedName("sr") + @ObfuscatedGetter( + intValue = 135931079 + ) + static int field629; + @ObfuscatedName("pq") + static int[] field851; + @ObfuscatedName("po") + static long[] field707; + @ObfuscatedName("oy") @ObfuscatedSignature( - signature = "Lbw;" + signature = "Ljs;" + ) + static NodeDeque field865; + @ObfuscatedName("pa") + static int[] field850; + @ObfuscatedName("of") + @ObfuscatedSignature( + signature = "Ljs;" + ) + static NodeDeque field883; + @ObfuscatedName("rc") + static int[] field876; + @ObfuscatedName("rw") + static int[] field875; + @ObfuscatedName("re") + static int[] field877; + @ObfuscatedName("ro") + @Export("zoomWidth") + static short zoomWidth; + @ObfuscatedName("mb") + @Export("playerMod") + static boolean playerMod; + @ObfuscatedName("rb") + @Export("zoomHeight") + static short zoomHeight; + @ObfuscatedName("ry") + static int[] field878; + @ObfuscatedName("ms") + @ObfuscatedGetter( + intValue = 171617061 + ) + static int field790; + @ObfuscatedName("ph") + @ObfuscatedGetter( + intValue = 1104581319 + ) + static int field682; + @ObfuscatedName("ml") + @ObfuscatedGetter( + intValue = 6075793 + ) + static int field791; + @ObfuscatedName("nw") + @ObfuscatedGetter( + intValue = 1430052583 + ) + @Export("chatCycle") + static int chatCycle; + @ObfuscatedName("pc") + static String field846; + @ObfuscatedName("sw") + @ObfuscatedSignature( + signature = "Lbb;" ) @Export("GrandExchangeEvents_worldComparator") static GrandExchangeOfferOwnWorldComparator GrandExchangeEvents_worldComparator; + @ObfuscatedName("pe") + static int[] field864; @ObfuscatedName("w") @ObfuscatedSignature( - signature = "[Lfh;" + signature = "[Lfp;" ) @Export("collisionMaps") static CollisionMap[] collisionMaps; - @ObfuscatedName("ah") - static boolean field831; - @ObfuscatedName("bi") + @ObfuscatedName("ab") + static boolean field895; + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = 664513407 + intValue = 860985583 ) @Export("worldId") public static int worldId; - @ObfuscatedName("bo") + @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = -1431286255 + intValue = 192625081 ) @Export("worldProperties") static int worldProperties; - @ObfuscatedName("bu") + @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = -979515215 + intValue = -1621867791 ) @Export("gameBuild") static int gameBuild; - @ObfuscatedName("bj") + @ObfuscatedName("bx") @Export("isMembersWorld") public static boolean isMembersWorld; - @ObfuscatedName("bm") + @ObfuscatedName("bc") @Export("isLowDetail") static boolean isLowDetail; - @ObfuscatedName("ba") + @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = 1709497385 + intValue = 285214129 ) @Export("clientType") static int clientType; - @ObfuscatedName("bb") + @ObfuscatedName("ba") @Export("onMobile") static boolean onMobile; - @ObfuscatedName("bg") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = 1930753179 + intValue = -1978456723 ) @Export("gameState") static int gameState; - @ObfuscatedName("co") + @ObfuscatedName("cf") @Export("isLoading") static boolean isLoading; - @ObfuscatedName("cr") + @ObfuscatedName("cs") @ObfuscatedGetter( - intValue = -283063249 + intValue = 1942837123 ) @Export("cycle") static int cycle; - @ObfuscatedName("ck") + @ObfuscatedName("ch") @ObfuscatedGetter( - longValue = 1346502483774771015L + longValue = 9167305382877438331L ) @Export("mouseLastLastPressedTimeMillis") static long mouseLastLastPressedTimeMillis; - @ObfuscatedName("cy") - @ObfuscatedGetter( - intValue = -1710295131 - ) - static int field877; @ObfuscatedName("cn") @ObfuscatedGetter( - intValue = -1896423743 + intValue = 785556091 ) - static int field657; - @ObfuscatedName("cj") + static int field642; + @ObfuscatedName("cx") @ObfuscatedGetter( - longValue = 7288307648884652687L + intValue = -284349487 ) - static long field658; - @ObfuscatedName("cq") + static int field681; + @ObfuscatedName("ck") + @ObfuscatedGetter( + longValue = 2095221084394078139L + ) + static long field728; + @ObfuscatedName("ce") @Export("hadFocus") static boolean hadFocus; - @ObfuscatedName("ci") + @ObfuscatedName("cu") @Export("displayFps") static boolean displayFps; - @ObfuscatedName("cu") + @ObfuscatedName("cg") @ObfuscatedGetter( - intValue = -179691599 + intValue = -2127828035 ) @Export("rebootTimer") static int rebootTimer; - @ObfuscatedName("cs") + @ObfuscatedName("ct") @ObfuscatedGetter( - intValue = 1452336083 + intValue = 1251218153 ) @Export("hintArrowType") static int hintArrowType; - @ObfuscatedName("cc") + @ObfuscatedName("cr") @ObfuscatedGetter( - intValue = 1408841509 + intValue = -643479427 ) @Export("hintArrowNpcIndex") static int hintArrowNpcIndex; - @ObfuscatedName("cp") + @ObfuscatedName("cy") @ObfuscatedGetter( - intValue = -1427936639 + intValue = -2133905465 ) @Export("hintArrowPlayerIndex") static int hintArrowPlayerIndex; - @ObfuscatedName("ce") + @ObfuscatedName("cz") @ObfuscatedGetter( - intValue = -1905046117 + intValue = 1969776841 ) @Export("hintArrowX") static int hintArrowX; - @ObfuscatedName("ca") + @ObfuscatedName("cm") @ObfuscatedGetter( - intValue = 1995090411 + intValue = -206701331 ) @Export("hintArrowY") static int hintArrowY; - @ObfuscatedName("cf") + @ObfuscatedName("cl") @ObfuscatedGetter( - intValue = -231665652 + intValue = -959107052 ) @Export("hintArrowHeight") static int hintArrowHeight; - @ObfuscatedName("cx") + @ObfuscatedName("ci") @ObfuscatedGetter( - intValue = 280792896 + intValue = 1849140865 ) @Export("hintArrowSubX") static int hintArrowSubX; - @ObfuscatedName("cz") + @ObfuscatedName("cc") @ObfuscatedGetter( - intValue = 1621938368 + intValue = 1728405841 ) @Export("hintArrowSubY") static int hintArrowSubY; @ObfuscatedName("cw") @ObfuscatedSignature( - signature = "Lco;" + signature = "Lcf;" ) @Export("playerAttackOption") static AttackOption playerAttackOption; - @ObfuscatedName("dw") + @ObfuscatedName("do") @ObfuscatedSignature( - signature = "Lco;" + signature = "Lcf;" ) @Export("npcAttackOption") static AttackOption npcAttackOption; @ObfuscatedName("dx") @ObfuscatedGetter( - intValue = 2117225913 + intValue = -727124447 ) @Export("titleLoadingStage") static int titleLoadingStage; - @ObfuscatedName("dj") + @ObfuscatedName("di") @ObfuscatedGetter( - intValue = -1916189945 + intValue = 1173358373 ) @Export("js5ConnectState") static int js5ConnectState; - @ObfuscatedName("dp") + @ObfuscatedName("dr") @ObfuscatedGetter( - intValue = 1530929997 + intValue = -1353267399 ) - static int field674; - @ObfuscatedName("ec") + static int field660; + @ObfuscatedName("ek") @ObfuscatedGetter( - intValue = 12617063 + intValue = -509949081 ) @Export("js5Errors") static int js5Errors; - @ObfuscatedName("em") + @ObfuscatedName("ew") @ObfuscatedGetter( - intValue = 499634575 + intValue = -492792025 ) @Export("loginState") static int loginState; - @ObfuscatedName("ee") + @ObfuscatedName("ep") @ObfuscatedGetter( - intValue = 221607875 + intValue = 303516097 ) - static int field887; - @ObfuscatedName("eu") - @ObfuscatedGetter( - intValue = 1579409689 - ) - static int field678; - @ObfuscatedName("ea") - @ObfuscatedGetter( - intValue = 310708051 - ) - static int field694; + static int field663; @ObfuscatedName("er") - @ObfuscatedSignature( - signature = "Lfx;" + @ObfuscatedGetter( + intValue = -27008237 ) - static class160 field680; - @ObfuscatedName("ex") + static int field740; + @ObfuscatedName("es") + @ObfuscatedGetter( + intValue = -427416641 + ) + static int field665; + @ObfuscatedName("eq") + @ObfuscatedSignature( + signature = "Lfv;" + ) + static class160 field743; + @ObfuscatedName("eg") @Export("Login_isUsernameRemembered") static boolean Login_isUsernameRemembered; - @ObfuscatedName("ep") + @ObfuscatedName("ec") @ObfuscatedSignature( - signature = "Lcy;" + signature = "Lcn;" ) @Export("secureRandomFuture") static SecureRandomFuture secureRandomFuture; - @ObfuscatedName("ei") + @ObfuscatedName("ea") @Export("randomDatData") static byte[] randomDatData; - @ObfuscatedName("ed") + @ObfuscatedName("eb") @ObfuscatedSignature( - signature = "[Lcd;" + signature = "[Lcp;" ) @Export("npcs") static NPC[] npcs; - @ObfuscatedName("eq") + @ObfuscatedName("em") @ObfuscatedGetter( - intValue = -1981398561 + intValue = -712593235 ) @Export("npcCount") static int npcCount; - @ObfuscatedName("fe") + @ObfuscatedName("fd") @Export("npcIndices") static int[] npcIndices; - @ObfuscatedName("fl") + @ObfuscatedName("ff") @ObfuscatedGetter( - intValue = 1827526777 + intValue = 278898125 ) - static int field687; - @ObfuscatedName("fj") - static int[] field688; - @ObfuscatedName("fm") + static int field673; + @ObfuscatedName("fe") + static int[] field720; + @ObfuscatedName("fo") @ObfuscatedSignature( - signature = "Lcc;" + signature = "Lcr;" ) @Export("packetWriter") public static final PacketWriter packetWriter; - @ObfuscatedName("fz") + @ObfuscatedName("fn") @ObfuscatedGetter( - intValue = 479164645 + intValue = 2048559591 ) @Export("logoutTimer") static int logoutTimer; - @ObfuscatedName("fi") - static boolean field691; - @ObfuscatedName("fo") + @ObfuscatedName("fy") + static boolean field677; + @ObfuscatedName("fu") @Export("useBufferedSocket") static boolean useBufferedSocket; - @ObfuscatedName("fu") + @ObfuscatedName("fl") @ObfuscatedSignature( - signature = "Ljl;" + signature = "Ljx;" ) @Export("timer") static Timer timer; - @ObfuscatedName("fh") + @ObfuscatedName("fp") @Export("fontsMap") static HashMap fontsMap; - @ObfuscatedName("ft") + @ObfuscatedName("fi") @ObfuscatedGetter( - intValue = -1155714541 + intValue = 1305702889 ) - static int field676; - @ObfuscatedName("fb") + static int field824; + @ObfuscatedName("fj") @ObfuscatedGetter( - intValue = -2129248571 + intValue = 2025601593 ) - static int field794; - @ObfuscatedName("fw") + static int field859; + @ObfuscatedName("fz") @ObfuscatedGetter( - intValue = 1251092849 + intValue = -244261703 ) - static int field850; - @ObfuscatedName("gm") - @ObfuscatedGetter( - intValue = 1774005601 - ) - static int field672; - @ObfuscatedName("gj") - @ObfuscatedGetter( - intValue = 333425851 - ) - static int field699; + static int field683; @ObfuscatedName("gw") + @ObfuscatedGetter( + intValue = 1006687669 + ) + static int field684; + @ObfuscatedName("ga") + @ObfuscatedGetter( + intValue = -958408065 + ) + static int field734; + @ObfuscatedName("gd") @Export("isInInstance") static boolean isInInstance; - @ObfuscatedName("go") + @ObfuscatedName("gb") @Export("instanceChunkTemplates") static int[][][] instanceChunkTemplates; - @ObfuscatedName("ga") - static final int[] field703; - @ObfuscatedName("gl") + @ObfuscatedName("gi") + static final int[] field689; + @ObfuscatedName("gt") @ObfuscatedGetter( - intValue = 1238371275 + intValue = -480027501 ) - static int field704; - @ObfuscatedName("hr") + static int field690; + @ObfuscatedName("he") @ObfuscatedGetter( - intValue = 974279119 + intValue = -43720627 ) - static int field705; - @ObfuscatedName("hg") + static int field691; + @ObfuscatedName("hd") @ObfuscatedGetter( - intValue = -1114899617 + intValue = -895055541 ) - static int field706; - @ObfuscatedName("ha") + static int field692; + @ObfuscatedName("hj") @ObfuscatedGetter( - intValue = 1195340625 + intValue = 97511831 ) - static int field707; - @ObfuscatedName("hn") + static int field693; + @ObfuscatedName("hy") @ObfuscatedGetter( - intValue = -870518941 + intValue = -1638312043 ) - static int field708; - @ObfuscatedName("hm") - static boolean field908; - @ObfuscatedName("hx") + static int field694; + @ObfuscatedName("hu") + static boolean field695; + @ObfuscatedName("ht") @ObfuscatedGetter( - intValue = 466427237 + intValue = -1245138777 ) @Export("alternativeScrollbarWidth") static int alternativeScrollbarWidth; - @ObfuscatedName("hk") + @ObfuscatedName("hv") @ObfuscatedGetter( - intValue = -1940558953 + intValue = 161071957 ) @Export("camAngleX") static int camAngleX; - @ObfuscatedName("ht") + @ObfuscatedName("hc") @ObfuscatedGetter( - intValue = 2068550151 + intValue = 1782454389 ) @Export("camAngleY") static int camAngleY; @ObfuscatedName("hw") @ObfuscatedGetter( - intValue = -31256613 + intValue = -1982031919 ) @Export("camAngleDY") static int camAngleDY; - @ObfuscatedName("hy") + @ObfuscatedName("hm") @ObfuscatedGetter( - intValue = 270383157 + intValue = 1897616521 ) @Export("camAngleDX") static int camAngleDX; - @ObfuscatedName("hu") + @ObfuscatedName("hf") @ObfuscatedGetter( - intValue = -1361461931 + intValue = 1783666051 ) @Export("mouseCamClickedX") static int mouseCamClickedX; - @ObfuscatedName("hq") + @ObfuscatedName("hl") @ObfuscatedGetter( - intValue = 30671027 + intValue = -346780995 ) @Export("mouseCamClickedY") static int mouseCamClickedY; - @ObfuscatedName("hp") + @ObfuscatedName("hk") @ObfuscatedGetter( - intValue = -1970077779 + intValue = 1183996551 ) @Export("oculusOrbState") static int oculusOrbState; - @ObfuscatedName("hb") + @ObfuscatedName("hp") @ObfuscatedGetter( - intValue = 467342205 + intValue = -1225679861 ) @Export("camFollowHeight") static int camFollowHeight; - @ObfuscatedName("hi") + @ObfuscatedName("ho") @ObfuscatedGetter( - intValue = -99029133 + intValue = 354489243 ) - static int field697; - @ObfuscatedName("hf") + static int field705; + @ObfuscatedName("hz") @ObfuscatedGetter( - intValue = -1744973303 + intValue = -2121988069 ) - static int field720; - @ObfuscatedName("ic") + static int field706; + @ObfuscatedName("ih") @ObfuscatedGetter( - intValue = 1224307299 + intValue = 693041111 ) - static int field818; - @ObfuscatedName("im") + static int field632; + @ObfuscatedName("ie") @ObfuscatedGetter( - intValue = -2053876137 + intValue = 1625985575 ) @Export("oculusOrbNormalSpeed") static int oculusOrbNormalSpeed; - @ObfuscatedName("if") + @ObfuscatedName("ic") @ObfuscatedGetter( - intValue = -468814589 + intValue = -5930147 ) @Export("oculusOrbSlowedSpeed") static int oculusOrbSlowedSpeed; - @ObfuscatedName("ik") + @ObfuscatedName("ia") @ObfuscatedGetter( - intValue = -1625015947 + intValue = 959698373 ) - static int field748; + public static int field710; + @ObfuscatedName("ip") + static boolean field751; + @ObfuscatedName("im") + @ObfuscatedGetter( + intValue = -1249522927 + ) + static int field712; @ObfuscatedName("it") @Export("selectedItemName") static String selectedItemName; - @ObfuscatedName("ib") - static boolean field826; - @ObfuscatedName("is") - @ObfuscatedGetter( - intValue = 965343951 - ) - static int field776; - @ObfuscatedName("ia") - static boolean field727; @ObfuscatedName("ir") + static boolean field713; + @ObfuscatedName("il") @ObfuscatedGetter( - intValue = -1343425675 + intValue = -2096925203 ) - static int field728; - @ObfuscatedName("ig") + static int field714; + @ObfuscatedName("iy") @ObfuscatedGetter( - intValue = -277251891 + intValue = -712265205 ) @Export("overheadTextCount") static int overheadTextCount; - @ObfuscatedName("ie") + @ObfuscatedName("io") @ObfuscatedGetter( - intValue = -739487043 + intValue = 1274484349 ) @Export("overheadTextLimit") static int overheadTextLimit; - @ObfuscatedName("iv") + @ObfuscatedName("iu") @Export("overheadTextXs") static int[] overheadTextXs; @ObfuscatedName("iq") @Export("overheadTextYs") static int[] overheadTextYs; - @ObfuscatedName("io") + @ObfuscatedName("ij") @Export("overheadTextAscents") static int[] overheadTextAscents; - @ObfuscatedName("id") + @ObfuscatedName("is") @Export("overheadTextXOffsets") static int[] overheadTextXOffsets; - @ObfuscatedName("in") + @ObfuscatedName("ik") @Export("overheadTextColors") static int[] overheadTextColors; - @ObfuscatedName("il") + @ObfuscatedName("id") @Export("overheadTextEffects") static int[] overheadTextEffects; - @ObfuscatedName("iu") + @ObfuscatedName("ig") @Export("overheadTextCyclesRemaining") static int[] overheadTextCyclesRemaining; - @ObfuscatedName("ip") + @ObfuscatedName("ii") @Export("overheadText") static String[] overheadText; - @ObfuscatedName("ih") + @ObfuscatedName("iw") @Export("tileLastDrawnActor") static int[][] tileLastDrawnActor; - @ObfuscatedName("ii") + @ObfuscatedName("ib") @ObfuscatedGetter( - intValue = 301129667 + intValue = 1082148805 ) @Export("viewportDrawCount") static int viewportDrawCount; - @ObfuscatedName("iy") + @ObfuscatedName("iv") @ObfuscatedGetter( - intValue = 1117796663 + intValue = 1604718859 ) @Export("viewportTempX") static int viewportTempX; - @ObfuscatedName("iw") + @ObfuscatedName("in") @ObfuscatedGetter( - intValue = -1022356229 + intValue = 141110117 ) @Export("viewportTempY") static int viewportTempY; - @ObfuscatedName("jm") + @ObfuscatedName("jl") @ObfuscatedGetter( - intValue = 1108408543 + intValue = 1442681791 ) @Export("mouseCrossX") static int mouseCrossX; - @ObfuscatedName("jd") + @ObfuscatedName("js") @ObfuscatedGetter( - intValue = 1117092081 + intValue = -267915889 ) @Export("mouseCrossY") static int mouseCrossY; - @ObfuscatedName("jj") + @ObfuscatedName("jw") @ObfuscatedGetter( - intValue = 1711302667 + intValue = 1233219852 ) @Export("mouseCrossState") static int mouseCrossState; - @ObfuscatedName("jw") + @ObfuscatedName("jo") @ObfuscatedGetter( - intValue = -1916688599 + intValue = -557514861 ) @Export("mouseCrossColor") static int mouseCrossColor; - @ObfuscatedName("jp") + @ObfuscatedName("ja") @Export("showMouseCross") static boolean showMouseCross; - @ObfuscatedName("jy") + @ObfuscatedName("jn") @ObfuscatedGetter( - intValue = -1524913155 + intValue = 1412380751 ) - static int field664; - @ObfuscatedName("jc") + static int field764; + @ObfuscatedName("jh") @ObfuscatedGetter( - intValue = 426832895 + intValue = -1293433949 ) - static int field749; - @ObfuscatedName("jo") + static int field735; + @ObfuscatedName("jk") @ObfuscatedGetter( - intValue = -696084645 + intValue = -958619817 ) @Export("dragItemSlotSource") static int dragItemSlotSource; - @ObfuscatedName("jl") + @ObfuscatedName("jx") @ObfuscatedGetter( - intValue = -948734419 + intValue = 1858822219 ) - static int field751; - @ObfuscatedName("js") + static int field863; + @ObfuscatedName("jd") @ObfuscatedGetter( - intValue = -1639572587 + intValue = 1449162079 ) - static int field752; - @ObfuscatedName("jr") + static int field738; + @ObfuscatedName("jy") @ObfuscatedGetter( - intValue = 1443949053 + intValue = -1787846911 ) @Export("dragItemSlotDestination") static int dragItemSlotDestination; - @ObfuscatedName("jq") - static boolean field754; + @ObfuscatedName("jm") + static boolean field768; @ObfuscatedName("ju") @ObfuscatedGetter( - intValue = -2139000407 + intValue = -353478655 ) @Export("itemDragDuration") static int itemDragDuration; - @ObfuscatedName("je") + @ObfuscatedName("jb") @ObfuscatedGetter( - intValue = -832368541 + intValue = -1748491077 ) - static int field756; + static int field678; @ObfuscatedName("jt") @Export("showLoadingMessages") static boolean showLoadingMessages; - @ObfuscatedName("ja") + @ObfuscatedName("jf") @ObfuscatedSignature( - signature = "[Lbg;" + signature = "[Lbn;" ) @Export("players") static Player[] players; - @ObfuscatedName("jb") + @ObfuscatedName("jc") @ObfuscatedGetter( - intValue = 241706055 + intValue = -1257096167 ) @Export("localPlayerIndex") static int localPlayerIndex; - @ObfuscatedName("jn") + @ObfuscatedName("jq") @ObfuscatedGetter( - intValue = 184797301 + intValue = -1822880047 ) - static int field789; - @ObfuscatedName("jf") + static int field746; + @ObfuscatedName("jj") @Export("renderSelf") static boolean renderSelf; - @ObfuscatedName("kw") + @ObfuscatedName("kf") @ObfuscatedGetter( - intValue = -1334418049 + intValue = 1400486467 ) @Export("drawPlayerNames") static int drawPlayerNames; - @ObfuscatedName("ka") + @ObfuscatedName("kk") @ObfuscatedGetter( - intValue = -629694105 + intValue = -1772541191 ) - static int field814; - @ObfuscatedName("kf") - static int[] field764; - @ObfuscatedName("ky") + static int field815; + @ObfuscatedName("ki") + static int[] field745; + @ObfuscatedName("kn") @Export("playerMenuOpcodes") static final int[] playerMenuOpcodes; - @ObfuscatedName("kr") + @ObfuscatedName("ka") @Export("playerMenuActions") static String[] playerMenuActions; - @ObfuscatedName("kk") + @ObfuscatedName("km") @Export("playerOptionsPriorities") static boolean[] playerOptionsPriorities; - @ObfuscatedName("kp") + @ObfuscatedName("ks") @Export("defaultRotations") static int[] defaultRotations; - @ObfuscatedName("kj") + @ObfuscatedName("kl") @ObfuscatedGetter( - intValue = -2070989129 + intValue = -1980827323 ) @Export("combatTargetPlayerIndex") static int combatTargetPlayerIndex; - @ObfuscatedName("kg") + @ObfuscatedName("kq") @ObfuscatedSignature( - signature = "[[[Ljd;" + signature = "[[[Ljs;" ) @Export("groundItems") static NodeDeque[][][] groundItems; - @ObfuscatedName("kz") + @ObfuscatedName("kh") @ObfuscatedSignature( - signature = "Ljd;" + signature = "Ljs;" ) @Export("pendingSpawns") static NodeDeque pendingSpawns; - @ObfuscatedName("kv") + @ObfuscatedName("kj") @ObfuscatedSignature( - signature = "Ljd;" + signature = "Ljs;" ) @Export("projectiles") static NodeDeque projectiles; - @ObfuscatedName("ko") + @ObfuscatedName("kv") @ObfuscatedSignature( - signature = "Ljd;" + signature = "Ljs;" ) @Export("graphicsObjects") static NodeDeque graphicsObjects; - @ObfuscatedName("kq") + @ObfuscatedName("kp") @Export("currentLevels") static int[] currentLevels; - @ObfuscatedName("kn") + @ObfuscatedName("ky") @Export("levels") static int[] levels; - @ObfuscatedName("ki") + @ObfuscatedName("kw") @Export("experience") static int[] experience; @ObfuscatedName("kb") @ObfuscatedGetter( - intValue = 1619030373 + intValue = -1271914129 ) @Export("leftClickOpensMenu") static int leftClickOpensMenu; - @ObfuscatedName("ke") + @ObfuscatedName("kg") @Export("isMenuOpen") static boolean isMenuOpen; - @ObfuscatedName("lu") + @ObfuscatedName("lf") @ObfuscatedGetter( - intValue = 1033223389 + intValue = -1021045037 ) @Export("menuOptionsCount") static int menuOptionsCount; - @ObfuscatedName("lq") + @ObfuscatedName("lv") @Export("menuArguments1") static int[] menuArguments1; - @ObfuscatedName("lb") + @ObfuscatedName("lc") @Export("menuArguments2") static int[] menuArguments2; - @ObfuscatedName("ll") + @ObfuscatedName("la") @Export("menuOpcodes") static int[] menuOpcodes; @ObfuscatedName("le") @Export("menuIdentifiers") static int[] menuIdentifiers; - @ObfuscatedName("lw") + @ObfuscatedName("lh") @Export("menuActions") static String[] menuActions; - @ObfuscatedName("ls") + @ObfuscatedName("lo") @Export("menuTargets") static String[] menuTargets; - @ObfuscatedName("ly") + @ObfuscatedName("lj") @Export("menuShiftClick") static boolean[] menuShiftClick; - @ObfuscatedName("lp") + @ObfuscatedName("lk") @Export("followerOpsLowPriority") static boolean followerOpsLowPriority; - @ObfuscatedName("lm") + @ObfuscatedName("li") @Export("shiftClickDrop") static boolean shiftClickDrop; - @ObfuscatedName("ln") + @ObfuscatedName("ls") @Export("tapToDrop") static boolean tapToDrop; - @ObfuscatedName("lt") + @ObfuscatedName("lz") @Export("showMouseOverText") static boolean showMouseOverText; - @ObfuscatedName("lf") + @ObfuscatedName("ln") @ObfuscatedGetter( - intValue = -17398737 + intValue = 981856147 ) @Export("viewportX") static int viewportX; - @ObfuscatedName("ld") + @ObfuscatedName("lr") @ObfuscatedGetter( - intValue = 1819623055 + intValue = -1679083747 ) @Export("viewportY") static int viewportY; - @ObfuscatedName("lr") + @ObfuscatedName("lm") @ObfuscatedGetter( - intValue = -943012111 + intValue = 1613029861 ) - static int field643; - @ObfuscatedName("lo") + static int field798; + @ObfuscatedName("ld") @ObfuscatedGetter( - intValue = -1168428899 + intValue = -1066881411 ) - static int field768; - @ObfuscatedName("lk") + static int field674; + @ObfuscatedName("lw") @ObfuscatedGetter( - intValue = 8672977 + intValue = -134952871 ) @Export("isItemSelected") static int isItemSelected; - @ObfuscatedName("lc") + @ObfuscatedName("lu") @Export("isSpellSelected") static boolean isSpellSelected; - @ObfuscatedName("lg") + @ObfuscatedName("ll") @ObfuscatedGetter( - intValue = -1752263001 + intValue = -1987429727 ) @Export("selectedSpellChildIndex") static int selectedSpellChildIndex; - @ObfuscatedName("mf") + @ObfuscatedName("mj") @ObfuscatedGetter( - intValue = -2117287011 + intValue = -1680716253 ) - static int field799; - @ObfuscatedName("mr") + static int field785; + @ObfuscatedName("mg") @Export("selectedSpellActionName") static String selectedSpellActionName; - @ObfuscatedName("mb") + @ObfuscatedName("my") @Export("selectedSpellName") static String selectedSpellName; - @ObfuscatedName("md") + @ObfuscatedName("mk") @ObfuscatedGetter( - intValue = 241193399 + intValue = -1055224191 ) @Export("rootInterface") static int rootInterface; static { - field831 = true; + field895 = true; worldId = 1; worldProperties = 0; gameBuild = 0; @@ -1274,9 +1277,9 @@ public final class Client extends GameShell implements Usernamed { isLoading = true; cycle = 0; mouseLastLastPressedTimeMillis = 1L; - field877 = -1; - field657 = -1; - field658 = -1L; + field642 = -1; + field681 = -1; + field728 = -1L; hadFocus = true; displayFps = false; rebootTimer = 0; @@ -1292,42 +1295,42 @@ public final class Client extends GameShell implements Usernamed { npcAttackOption = AttackOption.AttackOption_hidden; titleLoadingStage = 0; js5ConnectState = 0; - field674 = 0; + field660 = 0; js5Errors = 0; loginState = 0; - field887 = 0; - field678 = 0; - field694 = 0; - field680 = class160.field2006; + field663 = 0; + field740 = 0; + field665 = 0; + field743 = class160.field1985; Login_isUsernameRemembered = false; secureRandomFuture = new SecureRandomFuture(); randomDatData = null; npcs = new NPC[32768]; npcCount = 0; npcIndices = new int[32768]; - field687 = 0; - field688 = new int[250]; + field673 = 0; + field720 = new int[250]; packetWriter = new PacketWriter(); logoutTimer = 0; - field691 = false; + field677 = false; useBufferedSocket = true; timer = new Timer(); fontsMap = new HashMap(); - field676 = 0; - field794 = 1; - field850 = 0; - field672 = 1; - field699 = 0; + field824 = 0; + field859 = 1; + field683 = 0; + field684 = 1; + field734 = 0; collisionMaps = new CollisionMap[4]; isInInstance = false; instanceChunkTemplates = new int[4][13][13]; - field703 = 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}; - field704 = 0; - field705 = 2301979; - field706 = 5063219; - field707 = 3353893; - field708 = 7759444; - field908 = false; + field689 = new int[]{0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3}; + field690 = 0; + field691 = 2301979; + field692 = 5063219; + field693 = 3353893; + field694 = 7759444; + field695 = false; alternativeScrollbarWidth = 0; camAngleX = 128; camAngleY = 0; @@ -1337,16 +1340,16 @@ public final class Client extends GameShell implements Usernamed { mouseCamClickedY = 0; oculusOrbState = 0; camFollowHeight = 50; - field697 = 0; - field720 = 0; - field818 = 0; + field705 = 0; + field706 = 0; + field632 = 0; oculusOrbNormalSpeed = 12; oculusOrbSlowedSpeed = 6; - field748 = 0; - field826 = false; - field776 = 0; - field727 = false; - field728 = 0; + field710 = 0; + field751 = false; + field712 = 0; + field713 = false; + field714 = 0; overheadTextCount = 0; overheadTextLimit = 50; overheadTextXs = new int[overheadTextLimit]; @@ -1366,23 +1369,23 @@ public final class Client extends GameShell implements Usernamed { mouseCrossState = 0; mouseCrossColor = 0; showMouseCross = true; - field664 = 0; - field749 = 0; + field764 = 0; + field735 = 0; dragItemSlotSource = 0; - field751 = 0; - field752 = 0; + field863 = 0; + field738 = 0; dragItemSlotDestination = 0; - field754 = false; + field768 = false; itemDragDuration = 0; - field756 = 0; + field678 = 0; showLoadingMessages = true; players = new Player[2048]; localPlayerIndex = -1; - field789 = 0; + field746 = 0; renderSelf = true; drawPlayerNames = 0; - field814 = 0; - field764 = new int[1000]; + field815 = 0; + field745 = new int[1000]; playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51}; playerMenuActions = new String[8]; playerOptionsPriorities = new boolean[8]; @@ -1411,21 +1414,21 @@ public final class Client extends GameShell implements Usernamed { showMouseOverText = true; viewportX = -1; viewportY = -1; - field643 = 0; - field768 = 50; + field798 = 0; + field674 = 50; isItemSelected = 0; selectedItemName = null; isSpellSelected = false; selectedSpellChildIndex = -1; - field799 = -1; + field785 = -1; selectedSpellActionName = null; selectedSpellName = null; rootInterface = -1; interfaceParents = new NodeHashTable(8); - field804 = 0; - field805 = -1; + field790 = 0; + field791 = -1; chatEffects = 0; - field807 = 0; + field901 = 0; meslayerContinueWidget = null; runEnergy = 0; weight = 0; @@ -1438,54 +1441,54 @@ public final class Client extends GameShell implements Usernamed { widgetClickX = 0; widgetClickY = 0; draggedOnWidget = null; - field820 = false; - field698 = -1; - field822 = -1; - field823 = false; + field806 = false; + field807 = -1; field808 = -1; - field825 = -1; + field809 = false; + field882 = -1; + field811 = -1; isDraggingWidget = false; cycleCntr = 1; - field828 = new int[32]; - field829 = 0; + field814 = new int[32]; + field648 = 0; changedItemContainers = new int[32]; - field898 = 0; + field701 = 0; changedSkills = new int[32]; changedSkillsCount = 0; chatCycle = 0; - field833 = 0; - field836 = 0; - field645 = 0; - field734 = 0; - field834 = 0; + field711 = 0; + field862 = 0; + field823 = 0; + field860 = 0; + field825 = 0; mouseWheelRotation = 0; scriptEvents = new NodeDeque(); - field900 = new NodeDeque(); - field843 = new NodeDeque(); + field865 = new NodeDeque(); + field883 = new NodeDeque(); widgetClickMasks = new NodeHashTable(512); rootWidgetCount = 0; - field690 = -2; - field847 = new boolean[100]; - field837 = new boolean[100]; - field849 = new boolean[100]; + field832 = -2; + field833 = new boolean[100]; + field834 = new boolean[100]; + field835 = new boolean[100]; rootWidgetXs = new int[100]; rootWidgetYs = new int[100]; rootWidgetWidths = new int[100]; rootWidgetHeights = new int[100]; gameDrawingMode = 0; - field652 = 0L; + field841 = 0L; isResizable = true; - field857 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; + field864 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; publicChatMode = 0; tradeChatMode = 0; - field860 = ""; - field861 = new long[100]; - field855 = 0; - field889 = 0; - field864 = new int[128]; - field865 = new int[128]; - field866 = -1L; - field867 = -1; + field846 = ""; + field707 = new long[100]; + field682 = 0; + field849 = 0; + field850 = new int[128]; + field851 = new int[128]; + field852 = -1L; + field853 = -1; mapIconCount = 0; mapIconXs = new int[1000]; mapIconYs = new int[1000]; @@ -1495,7 +1498,7 @@ public final class Client extends GameShell implements Usernamed { minimapState = 0; musicVolume = 255; currentTrackGroupId = -1; - field742 = false; + field767 = false; soundEffectVolume = 127; areaSoundEffectVolume = 127; soundEffectCount = 0; @@ -1505,47 +1508,47 @@ public final class Client extends GameShell implements Usernamed { soundLocations = new int[50]; soundEffects = new SoundEffect[50]; isCameraLocked = false; - field835 = new boolean[5]; - field736 = new int[5]; - field901 = new int[5]; - field890 = new int[5]; - field891 = new int[5]; - field880 = 256; - field893 = 205; + field779 = new boolean[5]; + field875 = new int[5]; + field876 = new int[5]; + field877 = new int[5]; + field878 = new int[5]; + field879 = 256; + field880 = 205; zoomHeight = 256; zoomWidth = 320; - field896 = 1; - field897 = 32767; - field785 = 1; - field679 = 32767; + field796 = 1; + field884 = 32767; + field804 = 1; + field886 = 32767; viewportOffsetX = 0; viewportOffsetY = 0; viewportWidth = 0; viewportHeight = 0; viewportZoom = 0; playerAppearance = new PlayerAppearance(); - field906 = -1; - field907 = -1; + field893 = -1; + field894 = -1; platformInfoProvider = new DesktopPlatformInfoProvider(); grandExchangeOffers = new GrandExchangeOffer[8]; GrandExchangeEvents_worldComparator = new GrandExchangeOfferOwnWorldComparator(); - field863 = -1; + field749 = -1; archiveLoaders = new ArrayList(10); archiveLoadersDone = 0; - field914 = 0; - field915 = new class65(); - field916 = new int[50]; - field862 = new int[50]; + field629 = 0; + field902 = new class65(); + field903 = new int[50]; + field730 = new int[50]; } - @ObfuscatedName("e") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1452127908" + garbageValue = "-1309389764" ) @Export("resizeGame") protected final void resizeGame() { - field652 = TaskHandler.currentTimeMillis() + 500L; + field841 = WorldMapID.currentTimeMillis() + 500L; this.resizeJS(); if (rootInterface != -1) { this.resizeRoot(true); @@ -1553,68 +1556,122 @@ public final class Client extends GameShell implements Usernamed { } - @ObfuscatedName("aa") + @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "81" + signature = "(I)V", + garbageValue = "557803519" ) @Export("setUp") protected final void setUp() { - class286.method5353(new int[]{20, 260, 10000}, new int[]{1000, 100, 500}); - SecureRandomCallable.port1 = gameBuild == 0 ? 43594 : worldId + 40000; - class49.port2 = gameBuild == 0 ? 443 : worldId + 50000; - WorldMapIcon_0.port3 = SecureRandomCallable.port1; - PlayerAppearance.field2548 = class215.field2553; - ArchiveLoader.field533 = class215.field2554; - PlayerAppearance.field2542 = class215.field2555; - TileItemPile.field1537 = class215.field2556; - SpriteMask.urlRequester = new UrlRequester(); + Players.method2161(new int[]{20, 260, 10000}, new int[]{1000, 100, 500}); + class197.port1 = gameBuild == 0 ? 43594 : worldId + 40000; + MouseRecorder.port2 = gameBuild == 0 ? 443 : worldId + 50000; + WorldMapData_1.port3 = class197.port1; + PlayerAppearance.field2525 = class215.field2529; + WorldMapSection1.field269 = class215.field2533; + IntHashTable.field4010 = class215.field2531; + CollisionMap.field2066 = class215.field2532; + BufferedNetSocket.urlRequester = new UrlRequester(); this.setUpKeyboard(); this.setUpMouse(); - ItemContainer.mouseWheel = this.mouseWheel(); - class30.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); - UserComparator10.clientPreferences = WorldMapArea.method422(); - this.setUpClipboard(); - String var2 = Players.null_string; - class51.applet = this; - if (var2 != null) { - class51.field424 = var2; + MusicPatch.mouseWheel = this.mouseWheel(); + WorldMapRectangle.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); + AccessFile var2 = null; + ClientPreferences var3 = new ClientPreferences(); + + try { + var2 = Messages.getPreferencesFile("", AbstractWorldMapIcon.field284.name, false); + byte[] var4 = new byte[(int)var2.length()]; + + int var6; + for (int var5 = 0; var5 < var4.length; var5 += var6) { + var6 = var2.read(var4, var5, var4.length - var5); + if (var6 == -1) { + throw new IOException(); + } + } + + var3 = new ClientPreferences(new Buffer(var4)); + } catch (Exception var8) { } + try { + if (var2 != null) { + var2.close(); + } + } catch (Exception var7) { + } + + Interpreter.clientPreferences = var3; + this.setUpClipboard(); + class3.method39(this, GameShell.null_string); if (gameBuild != 0) { displayFps = true; } - MouseHandler.setWindowedMode(UserComparator10.clientPreferences.windowMode); - VertexNormal.friendSystem = new FriendSystem(WorldMapLabelSize.loginType); + class60.setWindowedMode(Interpreter.clientPreferences.windowMode); + Message.friendSystem = new FriendSystem(class188.loginType); } - @ObfuscatedName("ab") + @ObfuscatedName("ae") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "776219916" + garbageValue = "1971545072" ) @Export("doCycle") protected final void doCycle() { ++cycle; this.doCycleJs5(); - NetCache.method4399(); - ScriptEvent.method1198(); - Tiles.playPcmPlayers(); + class173.method3560(); + + int var1; + try { + if (class197.field2392 == 1) { + var1 = GZipDecompressor.midiPcmStream.method3692(); + if (var1 > 0 && GZipDecompressor.midiPcmStream.isReady()) { + var1 -= ParamDefinition.field3275; + if (var1 < 0) { + var1 = 0; + } + + GZipDecompressor.midiPcmStream.setPcmStreamVolume(var1); + } else { + GZipDecompressor.midiPcmStream.clear(); + GZipDecompressor.midiPcmStream.removeAll(); + if (Coord.musicTrackArchive != null) { + class197.field2392 = 2; + } else { + class197.field2392 = 0; + } + + class197.musicTrack = null; + class268.soundCache = null; + } + } + } catch (Exception var35) { + var35.printStackTrace(); + GZipDecompressor.midiPcmStream.clear(); + class197.field2392 = 0; + class197.musicTrack = null; + class268.soundCache = null; + Coord.musicTrackArchive = null; + } + + WorldMapLabel.playPcmPlayers(); + int var2; synchronized(KeyHandler.KeyHandler_instance) { ++KeyHandler.KeyHandler_idleCycles; - KeyHandler.field399 = KeyHandler.field384; - KeyHandler.field398 = 0; - int var2; - if (KeyHandler.field397 >= 0) { - while (KeyHandler.field393 != KeyHandler.field397) { - var2 = KeyHandler.field394[KeyHandler.field393]; - KeyHandler.field393 = KeyHandler.field393 + 1 & 127; + KeyHandler.field378 = KeyHandler.field380; + KeyHandler.field377 = 0; + if (KeyHandler.field373 >= 0) { + while (KeyHandler.field372 != KeyHandler.field373) { + var2 = KeyHandler.field371[KeyHandler.field372]; + KeyHandler.field372 = KeyHandler.field372 + 1 & 127; if (var2 < 0) { KeyHandler.KeyHandler_pressedKeys[~var2] = false; } else { - if (!KeyHandler.KeyHandler_pressedKeys[var2] && KeyHandler.field398 < KeyHandler.field378.length - 1) { - KeyHandler.field378[++KeyHandler.field398 - 1] = var2; + if (!KeyHandler.KeyHandler_pressedKeys[var2] && KeyHandler.field377 < KeyHandler.field376.length - 1) { + KeyHandler.field376[++KeyHandler.field377 - 1] = var2; } KeyHandler.KeyHandler_pressedKeys[var2] = true; @@ -1625,14 +1682,14 @@ public final class Client extends GameShell implements Usernamed { KeyHandler.KeyHandler_pressedKeys[var2] = false; } - KeyHandler.field397 = KeyHandler.field393; + KeyHandler.field373 = KeyHandler.field372; } - if (KeyHandler.field398 > 0) { + if (KeyHandler.field377 > 0) { KeyHandler.KeyHandler_idleCycles = 0; } - KeyHandler.field384 = KeyHandler.field400; + KeyHandler.field380 = KeyHandler.field386; } synchronized(MouseHandler.MouseHandler_instance) { @@ -1647,48 +1704,458 @@ public final class Client extends GameShell implements Usernamed { MouseHandler.MouseHandler_lastButtonVolatile = 0; } - int var5; - if (ItemContainer.mouseWheel != null) { - var5 = ItemContainer.mouseWheel.useRotation(); - mouseWheelRotation = var5; + if (MusicPatch.mouseWheel != null) { + var1 = MusicPatch.mouseWheel.useRotation(); + mouseWheelRotation = var1; } if (gameState == 0) { - GrandExchangeOfferOwnWorldComparator.load(); - BuddyRankComparator.clock.mark(); - - for (var5 = 0; var5 < 32; ++var5) { - GameShell.graphicsTickTimes[var5] = 0L; - } - - for (var5 = 0; var5 < 32; ++var5) { - GameShell.clientTickTimes[var5] = 0L; - } - - GameShell.gameCyclesToDo = 0; + WorldMapRegion.load(); + Skeleton.method3088(); } else if (gameState == 5) { - ObjectDefinition.doCycleTitle(this); - GrandExchangeOfferOwnWorldComparator.load(); - BuddyRankComparator.clock.mark(); - - for (var5 = 0; var5 < 32; ++var5) { - GameShell.graphicsTickTimes[var5] = 0L; - } - - for (var5 = 0; var5 < 32; ++var5) { - GameShell.clientTickTimes[var5] = 0L; - } - - GameShell.gameCyclesToDo = 0; + UserComparator8.doCycleTitle(this); + WorldMapRegion.load(); + Skeleton.method3088(); } else if (gameState != 10 && gameState != 11) { if (gameState == 20) { - ObjectDefinition.doCycleTitle(this); + UserComparator8.doCycleTitle(this); this.doCycleLoggedOut(); } else if (gameState == 25) { - class267.method5068(); + CollisionMap.method3557(false); + field824 = 0; + boolean var36 = true; + + for (var2 = 0; var2 < Projectile.regionLandArchives.length; ++var2) { + if (SecureRandomFuture.regionMapArchiveIds[var2] != -1 && Projectile.regionLandArchives[var2] == null) { + Projectile.regionLandArchives[var2] = AbstractWorldMapData.archive5.takeFile(SecureRandomFuture.regionMapArchiveIds[var2], 0); + if (Projectile.regionLandArchives[var2] == null) { + var36 = false; + ++field824; + } + } + + if (class222.regionLandArchiveIds[var2] != -1 && GrandExchangeOfferOwnWorldComparator.regionMapArchives[var2] == null) { + GrandExchangeOfferOwnWorldComparator.regionMapArchives[var2] = AbstractWorldMapData.archive5.takeFileEncrypted(class222.regionLandArchiveIds[var2], 0, Canvas.xteaKeys[var2]); + if (GrandExchangeOfferOwnWorldComparator.regionMapArchives[var2] == null) { + var36 = false; + ++field824; + } + } + } + + if (!var36) { + field734 = 1; + } else { + field683 = 0; + var36 = true; + + int var5; + Buffer var9; + int var10; + int var11; + int var12; + int var14; + int var15; + int var16; + int var17; + int var18; + int var19; + int var25; + for (var2 = 0; var2 < Projectile.regionLandArchives.length; ++var2) { + byte[] var3 = GrandExchangeOfferOwnWorldComparator.regionMapArchives[var2]; + if (var3 != null) { + var25 = (WorldMapSection2.regions[var2] >> 8) * 64 - MusicPatchPcmStream.baseX * 64; + var5 = (WorldMapSection2.regions[var2] & 255) * 64 - ScriptEvent.baseY * 64; + if (isInInstance) { + var25 = 10; + var5 = 10; + } + + boolean var8 = true; + var9 = new Buffer(var3); + var10 = -1; + + label694: + while (true) { + var11 = var9.method5558(); + if (var11 == 0) { + var36 &= var8; + break; + } + + var10 += var11; + var12 = 0; + boolean var13 = false; + + while (true) { + while (!var13) { + var14 = var9.readUShortSmart(); + if (var14 == 0) { + continue label694; + } + + var12 += var14 - 1; + var15 = var12 & 63; + var16 = var12 >> 6 & 63; + var17 = var9.readUnsignedByte() >> 2; + var18 = var16 + var25; + var19 = var15 + var5; + if (var18 > 0 && var19 > 0 && var18 < 103 && var19 < 103) { + ObjectDefinition var20 = Coord.getObjectDefinition(var10); + if (var17 != 22 || !isLowDetail || var20.int1 != 0 || var20.interactType == 1 || var20.boolean2) { + if (!var20.needsModelFiles()) { + ++field683; + var8 = false; + } + + var13 = true; + } + } + } + + var14 = var9.readUShortSmart(); + if (var14 == 0) { + break; + } + + var9.readUnsignedByte(); + } + } + } + } + + if (!var36) { + field734 = 2; + } else { + if (field734 != 0) { + class1.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); + } + + WorldMapLabel.playPcmPlayers(); + class14.scene.clear(); + + for (var2 = 0; var2 < 4; ++var2) { + collisionMaps[var2].clear(); + } + + int var26; + for (var2 = 0; var2 < 4; ++var2) { + for (var26 = 0; var26 < 104; ++var26) { + for (var25 = 0; var25 < 104; ++var25) { + Tiles.Tiles_renderFlags[var2][var26][var25] = 0; + } + } + } + + WorldMapLabel.playPcmPlayers(); + WorldMapIcon_1.method277(); + var2 = Projectile.regionLandArchives.length; + WorldMapSectionType.method236(); + CollisionMap.method3557(true); + int var6; + int var7; + int var39; + int var41; + if (!isInInstance) { + var26 = 0; + + label632: + while (true) { + byte[] var27; + if (var26 >= var2) { + for (var26 = 0; var26 < var2; ++var26) { + var25 = (WorldMapSection2.regions[var26] >> 8) * 64 - MusicPatchPcmStream.baseX * 64; + var5 = (WorldMapSection2.regions[var26] & 255) * 64 - ScriptEvent.baseY * 64; + var27 = Projectile.regionLandArchives[var26]; + if (var27 == null && ClanMate.field3567 < 800) { + WorldMapLabel.playPcmPlayers(); + GrandExchangeOffer.method114(var25, var5, 64, 64); + } + } + + CollisionMap.method3557(true); + var26 = 0; + + while (true) { + if (var26 >= var2) { + break label632; + } + + byte[] var4 = GrandExchangeOfferOwnWorldComparator.regionMapArchives[var26]; + if (var4 != null) { + var5 = (WorldMapSection2.regions[var26] >> 8) * 64 - MusicPatchPcmStream.baseX * 64; + var6 = (WorldMapSection2.regions[var26] & 255) * 64 - ScriptEvent.baseY * 64; + WorldMapLabel.playPcmPlayers(); + Scene var29 = class14.scene; + CollisionMap[] var30 = collisionMaps; + var9 = new Buffer(var4); + var10 = -1; + + while (true) { + var11 = var9.method5558(); + if (var11 == 0) { + break; + } + + var10 += var11; + var12 = 0; + + while (true) { + var41 = var9.readUShortSmart(); + if (var41 == 0) { + break; + } + + var12 += var41 - 1; + var14 = var12 & 63; + var15 = var12 >> 6 & 63; + var16 = var12 >> 12; + var17 = var9.readUnsignedByte(); + var18 = var17 >> 2; + var19 = var17 & 3; + int var31 = var15 + var5; + int var21 = var6 + var14; + if (var31 > 0 && var21 > 0 && var31 < 103 && var21 < 103) { + int var22 = var16; + if ((Tiles.Tiles_renderFlags[1][var31][var21] & 2) == 2) { + var22 = var16 - 1; + } + + CollisionMap var23 = null; + if (var22 >= 0) { + var23 = var30[var22]; + } + + VarbitDefinition.method4500(var16, var31, var21, var10, var19, var18, var29, var23); + } + } + } + } + + ++var26; + } + } + + var25 = (WorldMapSection2.regions[var26] >> 8) * 64 - MusicPatchPcmStream.baseX * 64; + var5 = (WorldMapSection2.regions[var26] & 255) * 64 - ScriptEvent.baseY * 64; + var27 = Projectile.regionLandArchives[var26]; + if (var27 != null) { + WorldMapLabel.playPcmPlayers(); + var7 = GrandExchangeOfferTotalQuantityComparator.field47 * 8 - 48; + var39 = ClanMate.field3567 * 8 - 48; + CollisionMap[] var40 = collisionMaps; + var10 = 0; + + label629: + while (true) { + if (var10 >= 4) { + Buffer var28 = new Buffer(var27); + var11 = 0; + + while (true) { + if (var11 >= 4) { + break label629; + } + + for (var12 = 0; var12 < 64; ++var12) { + for (var41 = 0; var41 < 64; ++var41) { + PrivateChatMode.loadTerrain(var28, var11, var25 + var12, var5 + var41, var7, var39, 0); + } + } + + ++var11; + } + } + + for (var11 = 0; var11 < 64; ++var11) { + for (var12 = 0; var12 < 64; ++var12) { + if (var25 + var11 > 0 && var11 + var25 < 103 && var5 + var12 > 0 && var5 + var12 < 103) { + int[] var10000 = var40[var10].flags[var11 + var25]; + var10000[var12 + var5] &= -16777217; + } + } + } + + ++var10; + } + } + + ++var26; + } + } + + int var32; + if (isInInstance) { + var26 = 0; + + label565: + while (true) { + if (var26 >= 4) { + for (var26 = 0; var26 < 13; ++var26) { + for (var25 = 0; var25 < 13; ++var25) { + var5 = instanceChunkTemplates[0][var26][var25]; + if (var5 == -1) { + GrandExchangeOffer.method114(var26 * 8, var25 * 8, 8, 8); + } + } + } + + CollisionMap.method3557(true); + var26 = 0; + + while (true) { + if (var26 >= 4) { + break label565; + } + + WorldMapLabel.playPcmPlayers(); + + for (var25 = 0; var25 < 13; ++var25) { + for (var5 = 0; var5 < 13; ++var5) { + var6 = instanceChunkTemplates[var26][var25][var5]; + if (var6 != -1) { + var7 = var6 >> 24 & 3; + var39 = var6 >> 1 & 3; + var32 = var6 >> 14 & 1023; + var10 = var6 >> 3 & 2047; + var11 = (var32 / 8 << 8) + var10 / 8; + + for (var12 = 0; var12 < WorldMapSection2.regions.length; ++var12) { + if (WorldMapSection2.regions[var12] == var11 && GrandExchangeOfferOwnWorldComparator.regionMapArchives[var12] != null) { + UserComparator7.method3344(GrandExchangeOfferOwnWorldComparator.regionMapArchives[var12], var26, var25 * 8, var5 * 8, var7, (var32 & 7) * 8, (var10 & 7) * 8, var39, class14.scene, collisionMaps); + break; + } + } + } + } + } + + ++var26; + } + } + + WorldMapLabel.playPcmPlayers(); + + for (var25 = 0; var25 < 13; ++var25) { + for (var5 = 0; var5 < 13; ++var5) { + boolean var38 = false; + var7 = instanceChunkTemplates[var26][var25][var5]; + if (var7 != -1) { + var39 = var7 >> 24 & 3; + var32 = var7 >> 1 & 3; + var10 = var7 >> 14 & 1023; + var11 = var7 >> 3 & 2047; + var12 = (var10 / 8 << 8) + var11 / 8; + + for (var41 = 0; var41 < WorldMapSection2.regions.length; ++var41) { + if (WorldMapSection2.regions[var41] == var12 && Projectile.regionLandArchives[var41] != null) { + class48.method858(Projectile.regionLandArchives[var41], var26, var25 * 8, var5 * 8, var39, (var10 & 7) * 8, (var11 & 7) * 8, var32, collisionMaps); + var38 = true; + break; + } + } + } + + if (!var38) { + var39 = var26; + var32 = var25 * 8; + var10 = var5 * 8; + + for (var11 = 0; var11 < 8; ++var11) { + for (var12 = 0; var12 < 8; ++var12) { + Tiles.Tiles_heights[var39][var32 + var11][var10 + var12] = 0; + } + } + + if (var32 > 0) { + for (var11 = 1; var11 < 8; ++var11) { + Tiles.Tiles_heights[var39][var32][var11 + var10] = Tiles.Tiles_heights[var39][var32 - 1][var10 + var11]; + } + } + + if (var10 > 0) { + for (var11 = 1; var11 < 8; ++var11) { + Tiles.Tiles_heights[var39][var11 + var32][var10] = Tiles.Tiles_heights[var39][var32 + var11][var10 - 1]; + } + } + + if (var32 > 0 && Tiles.Tiles_heights[var39][var32 - 1][var10] != 0) { + Tiles.Tiles_heights[var39][var32][var10] = Tiles.Tiles_heights[var39][var32 - 1][var10]; + } else if (var10 > 0 && Tiles.Tiles_heights[var39][var32][var10 - 1] != 0) { + Tiles.Tiles_heights[var39][var32][var10] = Tiles.Tiles_heights[var39][var32][var10 - 1]; + } else if (var32 > 0 && var10 > 0 && Tiles.Tiles_heights[var39][var32 - 1][var10 - 1] != 0) { + Tiles.Tiles_heights[var39][var32][var10] = Tiles.Tiles_heights[var39][var32 - 1][var10 - 1]; + } + } + } + } + + ++var26; + } + } + + CollisionMap.method3557(true); + WorldMapLabel.playPcmPlayers(); + Language.method3624(class14.scene, collisionMaps); + CollisionMap.method3557(true); + var26 = Tiles.Tiles_minPlane; + if (var26 > UrlRequest.Client_plane) { + var26 = UrlRequest.Client_plane; + } + + if (var26 < UrlRequest.Client_plane - 1) { + var26 = UrlRequest.Client_plane - 1; + } + + if (isLowDetail) { + class14.scene.init(Tiles.Tiles_minPlane); + } else { + class14.scene.init(0); + } + + for (var25 = 0; var25 < 104; ++var25) { + for (var5 = 0; var5 < 104; ++var5) { + Skills.updateItemPile(var25, var5); + } + } + + WorldMapLabel.playPcmPlayers(); + class32.method556(); + ObjectDefinition.ObjectDefinition_cachedModelData.clear(); + PacketBufferNode var37; + if (class206.client.hasFrame()) { + var37 = class2.getPacketBufferNode(ClientPacket.field2180, packetWriter.isaacCipher); + var37.packetBuffer.writeInt(1057001181); + packetWriter.addNode(var37); + } + + if (!isInInstance) { + var25 = (GrandExchangeOfferTotalQuantityComparator.field47 - 6) / 8; + var5 = (GrandExchangeOfferTotalQuantityComparator.field47 + 6) / 8; + var6 = (ClanMate.field3567 - 6) / 8; + var7 = (ClanMate.field3567 + 6) / 8; + + for (var39 = var25 - 1; var39 <= var5 + 1; ++var39) { + for (var32 = var6 - 1; var32 <= var7 + 1; ++var32) { + if (var39 < var25 || var39 > var5 || var32 < var6 || var32 > var7) { + AbstractWorldMapData.archive5.loadRegionFromName("m" + var39 + "_" + var32); + AbstractWorldMapData.archive5.loadRegionFromName("l" + var39 + "_" + var32); + } + } + } + } + + class195.updateGameState(30); + WorldMapLabel.playPcmPlayers(); + MusicPatchNode2.method3669(); + var37 = class2.getPacketBufferNode(ClientPacket.field2176, packetWriter.isaacCipher); + packetWriter.addNode(var37); + Skeleton.method3088(); + } + } } } else { - ObjectDefinition.doCycleTitle(this); + UserComparator8.doCycleTitle(this); } if (gameState == 30) { @@ -1699,185 +2166,151 @@ public final class Client extends GameShell implements Usernamed { } - @ObfuscatedName("ar") + @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "(ZB)V", - garbageValue = "-24" + signature = "(ZI)V", + garbageValue = "-1655647135" ) @Export("draw") protected final void draw(boolean var1) { - boolean var2; - label171: { - try { - if (class197.field2411 == 2) { - if (WorldMapSprite.musicTrack == null) { - WorldMapSprite.musicTrack = MusicTrack.readTrack(class197.musicTrackArchive, UrlRequester.musicTrackGroupId, UserComparator7.musicTrackFileId); - if (WorldMapSprite.musicTrack == null) { - var2 = false; - break label171; - } - } - - if (NPC.soundCache == null) { - NPC.soundCache = new SoundCache(class197.soundEffectsArchive, class197.musicSamplesArchive); - } - - if (FaceNormal.midiPcmStream.loadMusicTrack(WorldMapSprite.musicTrack, class197.musicPatchesArchive, NPC.soundCache, 22050)) { - FaceNormal.midiPcmStream.clearAll(); - FaceNormal.midiPcmStream.setPcmStreamVolume(class197.musicTrackVolume); - FaceNormal.midiPcmStream.setMusicTrack(WorldMapSprite.musicTrack, ArchiveLoader.musicTrackBoolean); - class197.field2411 = 0; - WorldMapSprite.musicTrack = null; - NPC.soundCache = null; - class197.musicTrackArchive = null; - var2 = true; - break label171; - } - } - } catch (Exception var6) { - var6.printStackTrace(); - FaceNormal.midiPcmStream.clear(); - class197.field2411 = 0; - WorldMapSprite.musicTrack = null; - NPC.soundCache = null; - class197.musicTrackArchive = null; - } - - var2 = false; + boolean var2 = WorldMapCacheName.method619(); + if (var2 && field767 && UserComparator6.pcmPlayer0 != null) { + UserComparator6.pcmPlayer0.tryDiscard(); } - if (var2 && field742 && MenuAction.pcmPlayer0 != null) { - MenuAction.pcmPlayer0.tryDiscard(); + if ((gameState == 10 || gameState == 20 || gameState == 30) && field841 != 0L && WorldMapID.currentTimeMillis() > field841) { + class60.setWindowedMode(ItemDefinition.getWindowedMode()); } - if ((gameState == 10 || gameState == 20 || gameState == 30) && field652 != 0L && TaskHandler.currentTimeMillis() > field652) { - MouseHandler.setWindowedMode(class43.getWindowedMode()); - } - - int var4; + int var3; if (var1) { - for (var4 = 0; var4 < 100; ++var4) { - field847[var4] = true; + for (var3 = 0; var3 < 100; ++var3) { + field833[var3] = true; } } if (gameState == 0) { this.drawInitial(Login.Login_loadingPercent, Login.Login_loadingText, var1); } else if (gameState == 5) { - ClientPacket.drawTitle(JagexCache.fontBold12, AttackOption.fontPlain11, Player.fontPlain12); + MidiPcmStream.drawTitle(GrandExchangeOffer.fontBold12, class3.fontPlain11, ScriptFrame.fontPlain12); } else if (gameState != 10 && gameState != 11) { if (gameState == 20) { - ClientPacket.drawTitle(JagexCache.fontBold12, AttackOption.fontPlain11, Player.fontPlain12); + MidiPcmStream.drawTitle(GrandExchangeOffer.fontBold12, class3.fontPlain11, ScriptFrame.fontPlain12); } else if (gameState == 25) { - if (field699 == 1) { - if (field676 > field794) { - field794 = field676; + if (field734 == 1) { + if (field824 > field859) { + field859 = field824; } - var4 = (field794 * 50 - field676 * 50) / field794; - WorldMapIcon_1.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); - } else if (field699 == 2) { - if (field850 > field672) { - field672 = field850; + var3 = (field859 * 50 - field824 * 50) / field859; + class1.drawLoadingMessage("Loading - please wait." + "
" + " (" + var3 + "%" + ")", false); + } else if (field734 == 2) { + if (field683 > field684) { + field684 = field683; } - var4 = (field672 * 50 - field850 * 50) / field672 + 50; - WorldMapIcon_1.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); + var3 = (field684 * 50 - field683 * 50) / field684 + 50; + class1.drawLoadingMessage("Loading - please wait." + "
" + " (" + var3 + "%" + ")", false); } else { - WorldMapIcon_1.drawLoadingMessage("Loading - please wait.", false); + class1.drawLoadingMessage("Loading - please wait.", false); } } else if (gameState == 30) { this.drawLoggedIn(); } else if (gameState == 40) { - WorldMapIcon_1.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); + class1.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); } else if (gameState == 45) { - WorldMapIcon_1.drawLoadingMessage("Please wait...", false); + class1.drawLoadingMessage("Please wait...", false); } } else { - ClientPacket.drawTitle(JagexCache.fontBold12, AttackOption.fontPlain11, Player.fontPlain12); + MidiPcmStream.drawTitle(GrandExchangeOffer.fontBold12, class3.fontPlain11, ScriptFrame.fontPlain12); } if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { - for (var4 = 0; var4 < rootWidgetCount; ++var4) { - if (field837[var4]) { - DirectByteArrayCopier.rasterProvider.draw(rootWidgetXs[var4], rootWidgetYs[var4], rootWidgetWidths[var4], rootWidgetHeights[var4]); - field837[var4] = false; + for (var3 = 0; var3 < rootWidgetCount; ++var3) { + if (field834[var3]) { + IgnoreList.rasterProvider.draw(rootWidgetXs[var3], rootWidgetYs[var3], rootWidgetWidths[var3], rootWidgetHeights[var3]); + field834[var3] = false; } } } else if (gameState > 0) { - DirectByteArrayCopier.rasterProvider.drawFull(0, 0); + IgnoreList.rasterProvider.drawFull(0, 0); - for (var4 = 0; var4 < rootWidgetCount; ++var4) { - field837[var4] = false; + for (var3 = 0; var3 < rootWidgetCount; ++var3) { + field834[var3] = false; } } } - @ObfuscatedName("av") + @ObfuscatedName("aj") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-105" + signature = "(I)V", + garbageValue = "1818676977" ) @Export("kill0") protected final void kill0() { - if (AttackOption.varcs.hasUnwrittenChanges()) { - AttackOption.varcs.write(); + if (MilliClock.varcs.hasUnwrittenChanges()) { + MilliClock.varcs.write(); } - if (class2.mouseRecorder != null) { - class2.mouseRecorder.isRunning = false; + if (class173.mouseRecorder != null) { + class173.mouseRecorder.isRunning = false; } - class2.mouseRecorder = null; + class173.mouseRecorder = null; packetWriter.close(); - MusicPatchNode2.method3750(); - SpriteMask.method4040(); - ItemContainer.mouseWheel = null; - if (MenuAction.pcmPlayer0 != null) { - MenuAction.pcmPlayer0.shutdown(); - } - - if (class60.pcmPlayer1 != null) { - class60.pcmPlayer1.shutdown(); - } - - GameShell.method1074(); - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { - if (ArchiveDiskActionHandler.field3155 != 0) { - ArchiveDiskActionHandler.field3155 = 1; - - try { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); - } catch (InterruptedException var4) { - } + class179.method3579(); + if (MouseHandler.MouseHandler_instance != null) { + synchronized(MouseHandler.MouseHandler_instance) { + MouseHandler.MouseHandler_instance = null; } } - if (SpriteMask.urlRequester != null) { - SpriteMask.urlRequester.close(); - SpriteMask.urlRequester = null; + MusicPatch.mouseWheel = null; + if (UserComparator6.pcmPlayer0 != null) { + UserComparator6.pcmPlayer0.shutdown(); + } + + if (NetSocket.pcmPlayer1 != null) { + NetSocket.pcmPlayer1.shutdown(); + } + + ScriptEvent.method1183(); + class192.method3655(); + if (BufferedNetSocket.urlRequester != null) { + BufferedNetSocket.urlRequester.close(); + BufferedNetSocket.urlRequester = null; + } + + try { + JagexCache.JagexCache_dat2File.close(); + + for (int var3 = 0; var3 < JagexCache.idxCount; ++var3) { + AttackOption.JagexCache_idxFiles[var3].close(); + } + + JagexCache.JagexCache_idx255File.close(); + JagexCache.JagexCache_randomDat.close(); + } catch (Exception var5) { } - Login.method2125(); } - @ObfuscatedName("an") + @ObfuscatedName("bj") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1314130629" + garbageValue = "-1677674321" ) - protected final void vmethod1301() { + protected final void vmethod1290() { } public final void init() { try { if (this.checkHost()) { - int var4; - int var6; for (int var1 = 0; var1 <= 19; ++var1) { String var2 = this.getParameter(Integer.toString(var1)); if (var2 != null) { + int var4; switch(var1) { case 1: useBufferedSocket = Integer.parseInt(var2) != 0; @@ -1904,380 +2337,314 @@ public final class Client extends GameShell implements Usernamed { break; case 6: var4 = Integer.parseInt(var2); - Language var43; + Language var14; if (var4 >= 0 && var4 < Language.Language_valuesOrdered.length) { - var43 = Language.Language_valuesOrdered[var4]; + var14 = Language.Language_valuesOrdered[var4]; } else { - var43 = null; + var14 = null; } - VarbitDefinition.clientLanguage = var43; + Varps.clientLanguage = var14; break; case 7: var4 = Integer.parseInt(var2); - ServerBuild[] var5 = WorldMapSection0.method245(); - var6 = 0; + ServerBuild[] var5 = new ServerBuild[]{ServerBuild.BUILDLIVE, ServerBuild.WIP, ServerBuild.LIVE, ServerBuild.RC}; + ServerBuild[] var6 = var5; + int var7 = 0; - ServerBuild var3; + ServerBuild var13; while (true) { - if (var6 >= var5.length) { - var3 = null; + if (var7 >= var6.length) { + var13 = null; break; } - ServerBuild var7 = var5[var6]; - if (var4 == var7.field3109) { - var3 = var7; + ServerBuild var8 = var6[var7]; + if (var4 == var8.field3081) { + var13 = var8; break; } - ++var6; + ++var7; } - class40.field352 = var3; + class48.field402 = var13; break; case 8: if (var2.equalsIgnoreCase("true")) { } break; case 9: - WorldMapManager.field327 = var2; + UserComparator10.field1943 = var2; break; case 10: - UserComparator8.field1973 = (StudioGame)CollisionMap.findEnumerated(WorldMapAreaData.method709(), Integer.parseInt(var2)); - if (UserComparator8.field1973 == StudioGame.oldscape) { - WorldMapLabelSize.loginType = LoginType.oldscape; + StudioGame[] var3 = new StudioGame[]{StudioGame.stellardawn, StudioGame.game3, StudioGame.runescape, StudioGame.game4, StudioGame.oldscape, StudioGame.game5}; + AbstractWorldMapIcon.field284 = (StudioGame)DynamicObject.findEnumerated(var3, Integer.parseInt(var2)); + if (AbstractWorldMapIcon.field284 == StudioGame.oldscape) { + class188.loginType = LoginType.oldscape; } else { - WorldMapLabelSize.loginType = LoginType.field4031; + class188.loginType = LoginType.field4031; } break; case 12: worldId = Integer.parseInt(var2); break; case 14: - class13.field91 = Integer.parseInt(var2); + MouseRecorder.field564 = Integer.parseInt(var2); break; case 15: gameBuild = Integer.parseInt(var2); break; case 17: - WallDecoration.field1914 = var2; + TextureProvider.field1510 = var2; } } } - class1.method15(); - Canvas.worldHost = this.getCodeBase().getHost(); - String var17 = class40.field352.name; - byte var18 = 0; + AbstractArchive.method4222(); + CollisionMap.worldHost = this.getCodeBase().getHost(); + String var9 = class48.field402.name; + byte var10 = 0; try { - JagexCache.idxCount = 21; - PendingSpawn.cacheGamebuild = var18; - - try { - UrlRequest.field1947 = System.getProperty("os.name"); - } catch (Exception var37) { - UrlRequest.field1947 = "Unknown"; - } - - WorldMapIcon_0.field131 = UrlRequest.field1947.toLowerCase(); - - try { - JagexCache.userHomeDirectory = System.getProperty("user.home"); - if (JagexCache.userHomeDirectory != null) { - JagexCache.userHomeDirectory = JagexCache.userHomeDirectory + "/"; - } - } catch (Exception var36) { - } - - try { - if (WorldMapIcon_0.field131.startsWith("win")) { - if (JagexCache.userHomeDirectory == null) { - JagexCache.userHomeDirectory = System.getenv("USERPROFILE"); - } - } else if (JagexCache.userHomeDirectory == null) { - JagexCache.userHomeDirectory = System.getenv("HOME"); - } - - if (JagexCache.userHomeDirectory != null) { - JagexCache.userHomeDirectory = JagexCache.userHomeDirectory + "/"; - } - } catch (Exception var35) { - } - - if (JagexCache.userHomeDirectory == null) { - JagexCache.userHomeDirectory = "~/"; - } - - JagexCache.field2046 = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", JagexCache.userHomeDirectory, "/tmp/", ""}; - Ignored.field3610 = new String[]{".jagex_cache_" + PendingSpawn.cacheGamebuild, ".file_store_" + PendingSpawn.cacheGamebuild}; - int var19 = 0; - - File var27; - label338: - while (var19 < 4) { - String var45 = var19 == 0 ? "" : "" + var19; - JagexCache.JagexCache_locationFile = new File(JagexCache.userHomeDirectory, "jagex_cl_oldschool_" + var17 + var45 + ".dat"); - String var20 = null; - String var48 = null; - boolean var8 = false; - Buffer var10; - int var11; - int var13; - File var51; - if (JagexCache.JagexCache_locationFile.exists()) { - try { - AccessFile var9 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L); - - for (var10 = new Buffer((int)var9.length()); var10.offset < var10.array.length; var10.offset += var11) { - var11 = var9.read(var10.array, var10.offset, var10.array.length - var10.offset); - if (var11 == -1) { - throw new IOException(); - } - } - - var10.offset = 0; - var11 = var10.readUnsignedByte(); - if (var11 < 1 || var11 > 3) { - throw new IOException("" + var11); - } - - int var12 = 0; - if (var11 > 1) { - var12 = var10.readUnsignedByte(); - } - - if (var11 <= 2) { - var20 = var10.readStringCp1252NullCircumfixed(); - if (var12 == 1) { - var48 = var10.readStringCp1252NullCircumfixed(); - } - } else { - var20 = var10.readCESU8(); - if (var12 == 1) { - var48 = var10.readCESU8(); - } - } - - var9.close(); - } catch (IOException var40) { - var40.printStackTrace(); - } - - if (var20 != null) { - var51 = new File(var20); - if (!var51.exists()) { - var20 = null; - } - } - - if (var20 != null) { - var51 = new File(var20, "test.dat"); - - boolean var52; - try { - RandomAccessFile var21 = new RandomAccessFile(var51, "rw"); - var13 = var21.read(); - var21.seek(0L); - var21.write(var13); - var21.seek(0L); - var21.close(); - var51.delete(); - var52 = true; - } catch (Exception var34) { - var52 = false; - } - - if (!var52) { - var20 = null; - } - } - } - - if (var20 == null && var19 == 0) { - label313: - for (int var22 = 0; var22 < Ignored.field3610.length; ++var22) { - for (int var23 = 0; var23 < JagexCache.field2046.length; ++var23) { - File var24 = new File(JagexCache.field2046[var23] + Ignored.field3610[var22] + File.separatorChar + "oldschool" + File.separatorChar); - if (var24.exists()) { - File var25 = new File(var24, "test.dat"); - - boolean var54; - try { - RandomAccessFile var14 = new RandomAccessFile(var25, "rw"); - int var15 = var14.read(); - var14.seek(0L); - var14.write(var15); - var14.seek(0L); - var14.close(); - var25.delete(); - var54 = true; - } catch (Exception var33) { - var54 = false; - } - - if (var54) { - var20 = var24.toString(); - var8 = true; - break label313; - } - } - } - } - } - - if (var20 == null) { - var20 = JagexCache.userHomeDirectory + File.separatorChar + "jagexcache" + var45 + File.separatorChar + "oldschool" + File.separatorChar + var17 + File.separatorChar; - var8 = true; - } - - File var50; - if (var48 != null) { - var50 = new File(var48); - var51 = new File(var20); - - try { - File[] var59 = var50.listFiles(); - File[] var56 = var59; - - for (var13 = 0; var13 < var56.length; ++var13) { - File var55 = var56[var13]; - File var26 = new File(var51, var55.getName()); - boolean var16 = var55.renameTo(var26); - if (!var16) { - throw new IOException(); - } - } - } catch (Exception var39) { - var39.printStackTrace(); - } - - var8 = true; - } - - if (var8) { - var50 = new File(var20); - var10 = null; - - try { - AccessFile var60 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L); - Buffer var57 = new Buffer(500); - var57.writeByte(3); - var57.writeByte(var10 != null ? 1 : 0); - var57.writeCESU8(var50.getPath()); - if (var10 != null) { - var57.writeCESU8(""); - } - - var60.write(var57.array, 0, var57.offset); - var60.close(); - } catch (IOException var32) { - var32.printStackTrace(); - } - } - - var27 = new File(var20); - UserComparator2.cacheDir = var27; - if (!UserComparator2.cacheDir.exists()) { - UserComparator2.cacheDir.mkdirs(); - } - - File[] var46 = UserComparator2.cacheDir.listFiles(); - if (var46 != null) { - File[] var61 = var46; - - for (int var28 = 0; var28 < var61.length; ++var28) { - File var29 = var61[var28]; - - boolean var58; - try { - RandomAccessFile var53 = new RandomAccessFile(var29, "rw"); - var11 = var53.read(); - var53.seek(0L); - var53.write(var11); - var53.seek(0L); - var53.close(); - var58 = true; - } catch (Exception var31) { - var58 = false; - } - - if (!var58) { - ++var19; - continue label338; - } - } - } - break; - } - - File var44 = UserComparator2.cacheDir; - FileSystem.FileSystem_cacheDir = var44; - if (!FileSystem.FileSystem_cacheDir.exists()) { - throw new RuntimeException(""); - } - - FileSystem.FileSystem_hasPermissions = true; - - try { - var27 = new File(JagexCache.userHomeDirectory, "random.dat"); - if (var27.exists()) { - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var27, "rw", 25L), 24, 0); - } else { - label260: - for (int var30 = 0; var30 < Ignored.field3610.length; ++var30) { - for (var6 = 0; var6 < JagexCache.field2046.length; ++var6) { - File var49 = new File(JagexCache.field2046[var6] + Ignored.field3610[var30] + File.separatorChar + "random.dat"); - if (var49.exists()) { - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var49, "rw", 25L), 24, 0); - break label260; - } - } - } - } - - if (JagexCache.JagexCache_randomDat == null) { - RandomAccessFile var47 = new RandomAccessFile(var27, "rw"); - var6 = var47.read(); - var47.seek(0L); - var47.write(var6); - var47.seek(0L); - var47.close(); - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var27, "rw", 25L), 24, 0); - } - } catch (IOException var38) { - } - - JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(ScriptFrame.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); - JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(ScriptFrame.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(ScriptFrame.getFile("main_file_cache.idx" + var4), "rw", 1048576L), 6000, 0); - } - } catch (Exception var41) { - Calendar.RunException_sendStackTrace((String)null, var41); + WorldMapRegion.method504("oldschool", var9, var10, 21); + } catch (Exception var11) { + DesktopPlatformInfoProvider.RunException_sendStackTrace((String)null, var11); } - AbstractWorldMapIcon.client = this; + class206.client = this; RunException.clientType = clientType; - this.startThread(765, 503, 186); + this.startThread(765, 503, 187); } - } catch (RuntimeException var42) { - throw class219.newRunException(var42, "client.init(" + ')'); + } catch (RuntimeException var12) { + throw WorldMapAreaData.newRunException(var12, "client.init(" + ')'); } } - @ObfuscatedName("ei") + @ObfuscatedName("ff") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "-104" + garbageValue = "-67" ) @Export("doCycleJs5") void doCycleJs5() { if (gameState != 1000) { - boolean var1 = class30.method565(); + long var2 = WorldMapID.currentTimeMillis(); + int var4 = (int)(var2 - NetCache.field3138); + NetCache.field3138 = var2; + if (var4 > 200) { + var4 = 200; + } + + NetCache.NetCache_loadTime += var4; + boolean var1; + if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { + var1 = true; + } else if (class297.NetCache_socket == null) { + var1 = false; + } else { + try { + label241: { + if (NetCache.NetCache_loadTime > 30000) { + throw new IOException(); + } + + NetFileRequest var5; + Buffer var6; + while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { + var5 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); + var6 = new Buffer(4); + var6.writeByte(1); + var6.writeMedium((int)var5.key); + class297.NetCache_socket.write(var6.array, 0, 4); + NetCache.NetCache_pendingPriorityResponses.put(var5, var5.key); + --NetCache.NetCache_pendingPriorityWritesCount; + ++NetCache.NetCache_pendingPriorityResponsesCount; + } + + while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { + var5 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); + var6 = new Buffer(4); + var6.writeByte(0); + var6.writeMedium((int)var5.key); + class297.NetCache_socket.write(var6.array, 0, 4); + var5.removeDual(); + NetCache.NetCache_pendingResponses.put(var5, var5.key); + --NetCache.NetCache_pendingWritesCount; + ++NetCache.NetCache_pendingResponsesCount; + } + + for (int var17 = 0; var17 < 100; ++var17) { + int var18 = class297.NetCache_socket.available(); + if (var18 < 0) { + throw new IOException(); + } + + if (var18 == 0) { + break; + } + + NetCache.NetCache_loadTime = 0; + byte var7 = 0; + if (PrivateChatMode.NetCache_currentResponse == null) { + var7 = 8; + } else if (NetCache.field3150 == 0) { + var7 = 1; + } + + int var8; + int var9; + int var10; + int var12; + byte[] var10000; + int var10001; + Buffer var25; + if (var7 > 0) { + var8 = var7 - NetCache.NetCache_responseHeaderBuffer.offset; + if (var8 > var18) { + var8 = var18; + } + + class297.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var8); + if (NetCache.field3145 != 0) { + for (var9 = 0; var9 < var8; ++var9) { + var10000 = NetCache.NetCache_responseHeaderBuffer.array; + var10001 = var9 + NetCache.NetCache_responseHeaderBuffer.offset; + var10000[var10001] ^= NetCache.field3145; + } + } + + var25 = NetCache.NetCache_responseHeaderBuffer; + var25.offset += var8; + if (NetCache.NetCache_responseHeaderBuffer.offset < var7) { + break; + } + + if (PrivateChatMode.NetCache_currentResponse == null) { + NetCache.NetCache_responseHeaderBuffer.offset = 0; + var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); + var10 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); + int var11 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); + var12 = NetCache.NetCache_responseHeaderBuffer.readInt(); + long var13 = (long)(var10 + (var9 << 16)); + NetFileRequest var15 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var13); + class14.field89 = true; + if (var15 == null) { + var15 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var13); + class14.field89 = false; + } + + if (var15 == null) { + throw new IOException(); + } + + int var16 = var11 == 0 ? 5 : 9; + PrivateChatMode.NetCache_currentResponse = var15; + NetCache.NetCache_responseArchiveBuffer = new Buffer(var16 + var12 + PrivateChatMode.NetCache_currentResponse.padding); + NetCache.NetCache_responseArchiveBuffer.writeByte(var11); + NetCache.NetCache_responseArchiveBuffer.writeInt(var12); + NetCache.field3150 = 8; + NetCache.NetCache_responseHeaderBuffer.offset = 0; + } else if (NetCache.field3150 == 0) { + if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { + NetCache.field3150 = 1; + NetCache.NetCache_responseHeaderBuffer.offset = 0; + } else { + PrivateChatMode.NetCache_currentResponse = null; + } + } + } else { + var8 = NetCache.NetCache_responseArchiveBuffer.array.length - PrivateChatMode.NetCache_currentResponse.padding; + var9 = 512 - NetCache.field3150; + if (var9 > var8 - NetCache.NetCache_responseArchiveBuffer.offset) { + var9 = var8 - NetCache.NetCache_responseArchiveBuffer.offset; + } + + if (var9 > var18) { + var9 = var18; + } + + class297.NetCache_socket.read(NetCache.NetCache_responseArchiveBuffer.array, NetCache.NetCache_responseArchiveBuffer.offset, var9); + if (NetCache.field3145 != 0) { + for (var10 = 0; var10 < var9; ++var10) { + var10000 = NetCache.NetCache_responseArchiveBuffer.array; + var10001 = NetCache.NetCache_responseArchiveBuffer.offset + var10; + var10000[var10001] ^= NetCache.field3145; + } + } + + var25 = NetCache.NetCache_responseArchiveBuffer; + var25.offset += var9; + NetCache.field3150 += var9; + if (var8 == NetCache.NetCache_responseArchiveBuffer.offset) { + if (16711935L == PrivateChatMode.NetCache_currentResponse.key) { + NetCache.NetCache_reference = NetCache.NetCache_responseArchiveBuffer; + + for (var10 = 0; var10 < 256; ++var10) { + Archive var19 = NetCache.NetCache_archives[var10]; + if (var19 != null) { + NetCache.NetCache_reference.offset = var10 * 8 + 5; + var12 = NetCache.NetCache_reference.readInt(); + int var20 = NetCache.NetCache_reference.readInt(); + var19.loadIndex(var12, var20); + } + } + } else { + NetCache.NetCache_crc.reset(); + NetCache.NetCache_crc.update(NetCache.NetCache_responseArchiveBuffer.array, 0, var8); + var10 = (int)NetCache.NetCache_crc.getValue(); + if (var10 != PrivateChatMode.NetCache_currentResponse.crc) { + try { + class297.NetCache_socket.close(); + } catch (Exception var23) { + } + + ++NetCache.NetCache_crcMismatches; + class297.NetCache_socket = null; + NetCache.field3145 = (byte)((int)(Math.random() * 255.0D + 1.0D)); + var1 = false; + break label241; + } + + NetCache.NetCache_crcMismatches = 0; + NetCache.NetCache_ioExceptions = 0; + PrivateChatMode.NetCache_currentResponse.archive.write((int)(PrivateChatMode.NetCache_currentResponse.key & 65535L), NetCache.NetCache_responseArchiveBuffer.array, (PrivateChatMode.NetCache_currentResponse.key & 16711680L) == 16711680L, class14.field89); + } + + PrivateChatMode.NetCache_currentResponse.remove(); + if (class14.field89) { + --NetCache.NetCache_pendingPriorityResponsesCount; + } else { + --NetCache.NetCache_pendingResponsesCount; + } + + NetCache.field3150 = 0; + PrivateChatMode.NetCache_currentResponse = null; + NetCache.NetCache_responseArchiveBuffer = null; + } else { + if (NetCache.field3150 != 512) { + break; + } + + NetCache.field3150 = 0; + } + } + } + + var1 = true; + } + } catch (IOException var24) { + try { + class297.NetCache_socket.close(); + } catch (Exception var22) { + } + + ++NetCache.NetCache_ioExceptions; + class297.NetCache_socket = null; + var1 = false; + } + } + if (!var1) { this.doCycleJs5Connect(); } @@ -2285,10 +2652,10 @@ public final class Client extends GameShell implements Usernamed { } } - @ObfuscatedName("en") + @ObfuscatedName("fe") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-2127628124" + signature = "(S)V", + garbageValue = "-21988" ) @Export("doCycleJs5Connect") void doCycleJs5Connect() { @@ -2303,62 +2670,62 @@ public final class Client extends GameShell implements Usernamed { return; } - field674 = 3000; + field660 = 3000; NetCache.NetCache_ioExceptions = 3; } - if (--field674 + 1 <= 0) { + if (--field660 + 1 <= 0) { try { if (js5ConnectState == 0) { - KeyHandler.js5SocketTask = GameShell.taskHandler.newSocketTask(Canvas.worldHost, WorldMapIcon_0.port3); + SecureRandomCallable.js5SocketTask = GameShell.taskHandler.newSocketTask(CollisionMap.worldHost, WorldMapData_1.port3); ++js5ConnectState; } if (js5ConnectState == 1) { - if (KeyHandler.js5SocketTask.status == 2) { + if (SecureRandomCallable.js5SocketTask.status == 2) { this.js5Error(-1); return; } - if (KeyHandler.js5SocketTask.status == 1) { + if (SecureRandomCallable.js5SocketTask.status == 1) { ++js5ConnectState; } } if (js5ConnectState == 2) { if (useBufferedSocket) { - Interpreter.js5Socket = WorldMapEvent.method783((Socket)KeyHandler.js5SocketTask.result, 40000, 5000); + ModelData0.js5Socket = Buddy.method5215((Socket)SecureRandomCallable.js5SocketTask.result, 40000, 5000); } else { - Interpreter.js5Socket = new NetSocket((Socket)KeyHandler.js5SocketTask.result, GameShell.taskHandler, 5000); + ModelData0.js5Socket = new NetSocket((Socket)SecureRandomCallable.js5SocketTask.result, GameShell.taskHandler, 5000); } Buffer var1 = new Buffer(5); var1.writeByte(15); - var1.writeInt(186); - Interpreter.js5Socket.write(var1.array, 0, 5); + var1.writeInt(187); + ModelData0.js5Socket.write(var1.array, 0, 5); ++js5ConnectState; - Varps.field2533 = TaskHandler.currentTimeMillis(); + ItemContainer.field519 = WorldMapID.currentTimeMillis(); } if (js5ConnectState == 3) { - if (Interpreter.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { - int var2 = Interpreter.js5Socket.readUnsignedByte(); + if (ModelData0.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { + int var2 = ModelData0.js5Socket.readUnsignedByte(); if (var2 != 0) { this.js5Error(var2); return; } ++js5ConnectState; - } else if (TaskHandler.currentTimeMillis() - Varps.field2533 > 30000L) { + } else if (WorldMapID.currentTimeMillis() - ItemContainer.field519 > 30000L) { this.js5Error(-2); return; } } if (js5ConnectState == 4) { - UserComparator9.method3436(Interpreter.js5Socket, gameState > 20); - KeyHandler.js5SocketTask = null; - Interpreter.js5Socket = null; + FriendsList.method5229(ModelData0.js5Socket, gameState > 20); + SecureRandomCallable.js5SocketTask = null; + ModelData0.js5Socket = null; js5ConnectState = 0; js5Errors = 0; } @@ -2370,20 +2737,20 @@ public final class Client extends GameShell implements Usernamed { } } - @ObfuscatedName("eb") + @ObfuscatedName("fk") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "297233490" + garbageValue = "-1925866063" ) @Export("js5Error") void js5Error(int var1) { - KeyHandler.js5SocketTask = null; - Interpreter.js5Socket = null; + SecureRandomCallable.js5SocketTask = null; + ModelData0.js5Socket = null; js5ConnectState = 0; - if (WorldMapIcon_0.port3 == SecureRandomCallable.port1) { - WorldMapIcon_0.port3 = class49.port2; + if (WorldMapData_1.port3 == class197.port1) { + WorldMapData_1.port3 = MouseRecorder.port2; } else { - WorldMapIcon_0.port3 = SecureRandomCallable.port1; + WorldMapData_1.port3 = class197.port1; } ++js5Errors; @@ -2392,7 +2759,7 @@ public final class Client extends GameShell implements Usernamed { this.error("js5connect_full"); gameState = 1000; } else { - field674 = 3000; + field660 = 3000; } } else if (js5Errors >= 2 && var1 == 6) { this.error("js5connect_outofdate"); @@ -2402,16 +2769,16 @@ public final class Client extends GameShell implements Usernamed { this.error("js5connect"); gameState = 1000; } else { - field674 = 3000; + field660 = 3000; } } } - @ObfuscatedName("fx") + @ObfuscatedName("fu") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-2112641787" + garbageValue = "-443791919" ) @Export("doCycleLoggedOut") final void doCycleLoggedOut() { @@ -2420,86 +2787,94 @@ public final class Client extends GameShell implements Usernamed { try { if (loginState == 0) { - if (class51.secureRandom == null && (secureRandomFuture.isDone() || field887 > 250)) { - class51.secureRandom = secureRandomFuture.get(); + if (Login.secureRandom == null && (secureRandomFuture.isDone() || field663 > 250)) { + Login.secureRandom = secureRandomFuture.get(); secureRandomFuture.shutdown(); secureRandomFuture = null; } - if (class51.secureRandom != null) { + if (Login.secureRandom != null) { if (var1 != null) { ((AbstractSocket)var1).close(); var1 = null; } - SecureRandomFuture.socketTask = null; - field691 = false; - field887 = 0; + MenuAction.socketTask = null; + field677 = false; + field663 = 0; loginState = 1; } } if (loginState == 1) { - if (SecureRandomFuture.socketTask == null) { - SecureRandomFuture.socketTask = GameShell.taskHandler.newSocketTask(Canvas.worldHost, WorldMapIcon_0.port3); + if (MenuAction.socketTask == null) { + MenuAction.socketTask = GameShell.taskHandler.newSocketTask(CollisionMap.worldHost, WorldMapData_1.port3); } - if (SecureRandomFuture.socketTask.status == 2) { + if (MenuAction.socketTask.status == 2) { throw new IOException(); } - if (SecureRandomFuture.socketTask.status == 1) { + if (MenuAction.socketTask.status == 1) { if (useBufferedSocket) { - var1 = WorldMapEvent.method783((Socket)SecureRandomFuture.socketTask.result, 40000, 5000); + var1 = Buddy.method5215((Socket)MenuAction.socketTask.result, 40000, 5000); } else { - var1 = new NetSocket((Socket)SecureRandomFuture.socketTask.result, GameShell.taskHandler, 5000); + var1 = new NetSocket((Socket)MenuAction.socketTask.result, GameShell.taskHandler, 5000); } packetWriter.setSocket((AbstractSocket)var1); - SecureRandomFuture.socketTask = null; + MenuAction.socketTask = null; loginState = 2; } } - PacketBufferNode var3; if (loginState == 2) { packetWriter.clearBuffer(); - var3 = Varcs.method2221(); - var3.packetBuffer.writeByte(LoginPacket.field2324.id); - packetWriter.addNode(var3); + 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.field2282.id); + packetWriter.addNode(var4); packetWriter.flush(); var2.offset = 0; loginState = 3; } - int var4; - boolean var12; + boolean var13; + int var14; if (loginState == 3) { - if (MenuAction.pcmPlayer0 != null) { - MenuAction.pcmPlayer0.method2458(); + if (UserComparator6.pcmPlayer0 != null) { + UserComparator6.pcmPlayer0.method2472(); } - if (class60.pcmPlayer1 != null) { - class60.pcmPlayer1.method2458(); + if (NetSocket.pcmPlayer1 != null) { + NetSocket.pcmPlayer1.method2472(); } - var12 = true; + var13 = true; if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { - var12 = false; + var13 = false; } - if (var12) { - var4 = ((AbstractSocket)var1).readUnsignedByte(); - if (MenuAction.pcmPlayer0 != null) { - MenuAction.pcmPlayer0.method2458(); + if (var13) { + var14 = ((AbstractSocket)var1).readUnsignedByte(); + if (UserComparator6.pcmPlayer0 != null) { + UserComparator6.pcmPlayer0.method2472(); } - if (class60.pcmPlayer1 != null) { - class60.pcmPlayer1.method2458(); + if (NetSocket.pcmPlayer1 != null) { + NetSocket.pcmPlayer1.method2472(); } - if (var4 != 0) { - class162.getLoginError(var4); + if (var14 != 0) { + ModelData0.getLoginError(var14); return; } @@ -2508,158 +2883,161 @@ public final class Client extends GameShell implements Usernamed { } } - int var31; + int var28; if (loginState == 4) { if (var2.offset < 8) { - var31 = ((AbstractSocket)var1).available(); - if (var31 > 8 - var2.offset) { - var31 = 8 - var2.offset; + var28 = ((AbstractSocket)var1).available(); + if (var28 > 8 - var2.offset) { + var28 = 8 - var2.offset; } - if (var31 > 0) { - ((AbstractSocket)var1).read(var2.array, var2.offset, var31); - var2.offset += var31; + if (var28 > 0) { + ((AbstractSocket)var1).read(var2.array, var2.offset, var28); + var2.offset += var28; } } if (var2.offset == 8) { var2.offset = 0; - RouteStrategy.field2110 = var2.readLong(); + class2.field4 = var2.readLong(); loginState = 5; } } - int var7; - int var9; - int var14; if (loginState == 5) { packetWriter.packetBuffer.offset = 0; packetWriter.clearBuffer(); - PacketBuffer var21 = new PacketBuffer(500); - int[] var13 = new int[]{class51.secureRandom.nextInt(), class51.secureRandom.nextInt(), class51.secureRandom.nextInt(), class51.secureRandom.nextInt()}; - var21.offset = 0; - var21.writeByte(1); - var21.writeInt(var13[0]); - var21.writeInt(var13[1]); - var21.writeInt(var13[2]); - var21.writeInt(var13[3]); - var21.writeLong(RouteStrategy.field2110); - int var10; + PacketBuffer var3 = new PacketBuffer(500); + int[] var22 = new int[]{Login.secureRandom.nextInt(), Login.secureRandom.nextInt(), Login.secureRandom.nextInt(), Login.secureRandom.nextInt()}; + var3.offset = 0; + var3.writeByte(1); + var3.writeInt(var22[0]); + var3.writeInt(var22[1]); + var3.writeInt(var22[2]); + var3.writeInt(var22[3]); + var3.writeLong(class2.field4); if (gameState == 40) { - var21.writeInt(PlayerAppearance.field2552[0]); - var21.writeInt(PlayerAppearance.field2552[1]); - var21.writeInt(PlayerAppearance.field2552[2]); - var21.writeInt(PlayerAppearance.field2552[3]); + var3.writeInt(GrandExchangeOfferOwnWorldComparator.field626[0]); + var3.writeInt(GrandExchangeOfferOwnWorldComparator.field626[1]); + var3.writeInt(GrandExchangeOfferOwnWorldComparator.field626[2]); + var3.writeInt(GrandExchangeOfferOwnWorldComparator.field626[3]); } else { - var21.writeByte(field680.rsOrdinal()); - switch(field680.field2007) { + var3.writeByte(field743.rsOrdinal()); + switch(field743.field1987) { case 0: - case 2: - var21.writeMedium(class192.field2395); - ++var21.offset; - break; case 1: - LinkedHashMap var6 = UserComparator10.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); - } - - var21.writeInt((Integer)var6.get(var10)); + var3.writeMedium(class266.field3517); + ++var3.offset; + break; + case 2: + var3.writeInt((Integer)Interpreter.clientPreferences.parameters.get(UrlRequester.method3299(Login.Login_username))); break; case 3: - var21.offset += 4; + var3.offset += 4; } - var21.writeByte(class312.field3814.rsOrdinal()); - var21.writeStringCp1252NullTerminated(Login.Login_password); + var3.writeByte(class312.field3813.rsOrdinal()); + var3.writeStringCp1252NullTerminated(Login.Login_password); } - var21.encryptRsa(class83.field1158, class83.field1160); - PlayerAppearance.field2552 = var13; - PacketBufferNode var5 = Varcs.method2221(); - var5.packetBuffer.offset = 0; - if (gameState == 40) { - var5.packetBuffer.writeByte(LoginPacket.field2328.id); + var3.encryptRsa(class83.field1144, class83.field1142); + GrandExchangeOfferOwnWorldComparator.field626 = var22; + PacketBufferNode var6; + if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { + var6 = new PacketBufferNode(); } else { - var5.packetBuffer.writeByte(LoginPacket.field2326.id); + var6 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; } - var5.packetBuffer.writeShort(0); - var14 = var5.packetBuffer.offset; - var5.packetBuffer.writeInt(186); - var5.packetBuffer.writeInt(1); - var5.packetBuffer.writeByte(clientType); - var5.packetBuffer.writeBytes(var21.array, 0, var21.offset); - var7 = var5.packetBuffer.offset; - var5.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); - var5.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); - var5.packetBuffer.writeShort(BoundaryObject.canvasWidth); - var5.packetBuffer.writeShort(WorldMapCacheName.canvasHeight); - GrandExchangeOfferTotalQuantityComparator.method104(var5.packetBuffer); - var5.packetBuffer.writeStringCp1252NullTerminated(WorldMapManager.field327); - var5.packetBuffer.writeInt(class13.field91); - Buffer var29 = new Buffer(NPC.platformInfo.size()); - NPC.platformInfo.write(var29); - var5.packetBuffer.writeBytes(var29.array, 0, var29.array.length); - var5.packetBuffer.writeByte(clientType); - var5.packetBuffer.writeInt(0); - var5.packetBuffer.writeInt(GrandExchangeOfferAgeComparator.archive0.hash); - var5.packetBuffer.writeInt(class43.archive1.hash); - var5.packetBuffer.writeInt(class288.archive2.hash); - var5.packetBuffer.writeInt(WorldMapID.archive3.hash); - var5.packetBuffer.writeInt(SpriteMask.archive4.hash); - var5.packetBuffer.writeInt(DirectByteArrayCopier.archive5.hash); - var5.packetBuffer.writeInt(AbstractWorldMapData.archive6.hash); - var5.packetBuffer.writeInt(ClientPacket.archive7.hash); - var5.packetBuffer.writeInt(WorldMapRegion.archive8.hash); - var5.packetBuffer.writeInt(class2.archive9.hash); - var5.packetBuffer.writeInt(class81.archive10.hash); - var5.packetBuffer.writeInt(ScriptFrame.archive11.hash); - var5.packetBuffer.writeInt(class267.archive12.hash); - var5.packetBuffer.writeInt(class269.archive13.hash); - var5.packetBuffer.writeInt(class162.archive14.hash); - var5.packetBuffer.writeInt(class210.archive15.hash); - var5.packetBuffer.writeInt(0); - var5.packetBuffer.writeInt(AbstractWorldMapIcon.archive17.hash); - var5.packetBuffer.writeInt(UserComparator9.archive18.hash); - var5.packetBuffer.writeInt(class13.archive19.hash); - var5.packetBuffer.writeInt(class60.archive20.hash); - var5.packetBuffer.xteaEncrypt(var13, var7, var5.packetBuffer.offset); - var5.packetBuffer.writeLengthShort(var5.packetBuffer.offset - var14); - packetWriter.addNode(var5); + var6.clientPacket = null; + var6.clientPacketLength = 0; + var6.packetBuffer = new PacketBuffer(5000); + var6.packetBuffer.offset = 0; + if (gameState == 40) { + var6.packetBuffer.writeByte(LoginPacket.field2283.id); + } else { + var6.packetBuffer.writeByte(LoginPacket.field2285.id); + } + + var6.packetBuffer.writeShort(0); + int var15 = var6.packetBuffer.offset; + var6.packetBuffer.writeInt(187); + var6.packetBuffer.writeInt(1); + var6.packetBuffer.writeByte(clientType); + var6.packetBuffer.writeBytes(var3.array, 0, var3.offset); + int var8 = var6.packetBuffer.offset; + var6.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); + var6.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); + var6.packetBuffer.writeShort(GrandExchangeOfferTotalQuantityComparator.canvasWidth); + var6.packetBuffer.writeShort(AttackOption.canvasHeight); + PacketBuffer var9 = var6.packetBuffer; + if (randomDatData != null) { + var9.writeBytes(randomDatData, 0, randomDatData.length); + } else { + byte[] var10 = MenuAction.method2068(); + var9.writeBytes(var10, 0, var10.length); + } + + var6.packetBuffer.writeStringCp1252NullTerminated(UserComparator10.field1943); + var6.packetBuffer.writeInt(MouseRecorder.field564); + Buffer var27 = new Buffer(class42.platformInfo.size()); + class42.platformInfo.write(var27); + var6.packetBuffer.writeBytes(var27.array, 0, var27.array.length); + var6.packetBuffer.writeByte(clientType); + var6.packetBuffer.writeInt(0); + var6.packetBuffer.writeInt(ClientPacket.archive0.hash); + var6.packetBuffer.writeInt(ItemDefinition.archive1.hash); + var6.packetBuffer.writeInt(class2.archive2.hash); + var6.packetBuffer.writeInt(WorldMapData_1.archive3.hash); + var6.packetBuffer.writeInt(FloorDecoration.archive4.hash); + var6.packetBuffer.writeInt(AbstractWorldMapData.archive5.hash); + var6.packetBuffer.writeInt(GrandExchangeOfferWorldComparator.archive6.hash); + var6.packetBuffer.writeInt(MouseRecorder.archive7.hash); + var6.packetBuffer.writeInt(class3.archive8.hash); + var6.packetBuffer.writeInt(WorldMapManager.archive9.hash); + var6.packetBuffer.writeInt(ServerBuild.archive10.hash); + var6.packetBuffer.writeInt(class48.archive11.hash); + var6.packetBuffer.writeInt(SoundSystem.archive12.hash); + var6.packetBuffer.writeInt(WorldMapSection1.archive13.hash); + var6.packetBuffer.writeInt(class117.archive14.hash); + var6.packetBuffer.writeInt(GrandExchangeOfferTotalQuantityComparator.archive15.hash); + var6.packetBuffer.writeInt(0); + var6.packetBuffer.writeInt(GrandExchangeOfferNameComparator.archive17.hash); + var6.packetBuffer.writeInt(AbstractWorldMapData.archive18.hash); + var6.packetBuffer.writeInt(MusicPatchNode2.archive19.hash); + var6.packetBuffer.writeInt(UserComparator9.archive20.hash); + var6.packetBuffer.xteaEncrypt(var22, var8, var6.packetBuffer.offset); + var6.packetBuffer.writeLengthShort(var6.packetBuffer.offset - var15); + packetWriter.addNode(var6); packetWriter.flush(); - packetWriter.isaacCipher = new IsaacCipher(var13); - int[] var15 = new int[4]; + packetWriter.isaacCipher = new IsaacCipher(var22); + int[] var11 = new int[4]; - for (var10 = 0; var10 < 4; ++var10) { - var15[var10] = var13[var10] + 50; + for (int var12 = 0; var12 < 4; ++var12) { + var11[var12] = var22[var12] + 50; } - var2.newIsaacCipher(var15); + var2.newIsaacCipher(var11); loginState = 6; } if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { - var31 = ((AbstractSocket)var1).readUnsignedByte(); - if (var31 == 21 && gameState == 20) { + var28 = ((AbstractSocket)var1).readUnsignedByte(); + if (var28 == 21 && gameState == 20) { loginState = 9; - } else if (var31 == 2) { + } else if (var28 == 2) { loginState = 11; - } else if (var31 == 15 && gameState == 40) { + } else if (var28 == 15 && gameState == 40) { packetWriter.serverPacketLength = -1; loginState = 16; - } else if (var31 == 64) { + } else if (var28 == 64) { loginState = 7; - } else if (var31 == 23 && field678 < 1) { - ++field678; + } else if (var28 == 23 && field740 < 1) { + ++field740; loginState = 0; } else { - if (var31 != 29) { - class162.getLoginError(var31); + if (var28 != 29) { + ModelData0.getLoginError(var28); return; } @@ -2668,255 +3046,112 @@ public final class Client extends GameShell implements Usernamed { } if (loginState == 7 && ((AbstractSocket)var1).available() > 0) { - UrlRequester.field1940 = ((AbstractSocket)var1).readUnsignedByte(); + ClanMate.field3566 = ((AbstractSocket)var1).readUnsignedByte(); loginState = 8; } - if (loginState == 8 && ((AbstractSocket)var1).available() >= UrlRequester.field1940) { - ((AbstractSocket)var1).read(var2.array, 0, UrlRequester.field1940); + if (loginState == 8 && ((AbstractSocket)var1).available() >= ClanMate.field3566) { + ((AbstractSocket)var1).read(var2.array, 0, ClanMate.field3566); var2.offset = 0; loginState = 6; } if (loginState == 9 && ((AbstractSocket)var1).available() > 0) { - field694 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; + field665 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; loginState = 10; } if (loginState == 10) { - field887 = 0; - PacketWriter.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field694 / 60 + " seconds."); - if (--field694 <= 0) { + field663 = 0; + AbstractWorldMapData.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field665 / 60 + " seconds."); + if (--field665 <= 0) { loginState = 0; } } else { if (loginState == 11 && ((AbstractSocket)var1).available() >= 1) { - GrandExchangeOfferNameComparator.field73 = ((AbstractSocket)var1).readUnsignedByte(); + class54.field482 = ((AbstractSocket)var1).readUnsignedByte(); loginState = 12; } - if (loginState == 12 && ((AbstractSocket)var1).available() >= GrandExchangeOfferNameComparator.field73) { - var12 = ((AbstractSocket)var1).readUnsignedByte() == 1; + int var16; + if (loginState == 12 && ((AbstractSocket)var1).available() >= class54.field482) { + var13 = ((AbstractSocket)var1).readUnsignedByte() == 1; ((AbstractSocket)var1).read(var2.array, 0, 4); var2.offset = 0; - boolean var24 = false; - if (var12) { - var4 = var2.readByteIsaac() << 24; - var4 |= var2.readByteIsaac() << 16; - var4 |= var2.readByteIsaac() << 8; - var4 |= var2.readByteIsaac(); - String var28 = Login.Login_username; - var7 = var28.length(); - int var16 = 0; - var9 = 0; - - while (true) { - if (var9 >= var7) { - if (UserComparator10.clientPreferences.parameters.size() >= 10 && !UserComparator10.clientPreferences.parameters.containsKey(var16)) { - Iterator var30 = UserComparator10.clientPreferences.parameters.entrySet().iterator(); - var30.next(); - var30.remove(); - } - - UserComparator10.clientPreferences.parameters.put(var16, var4); - break; - } - - var16 = (var16 << 5) - var16 + var28.charAt(var9); - ++var9; + boolean var29 = false; + if (var13) { + var14 = var2.readByteIsaac() << 24; + var14 |= var2.readByteIsaac() << 16; + var14 |= var2.readByteIsaac() << 8; + var14 |= var2.readByteIsaac(); + var16 = UrlRequester.method3299(Login.Login_username); + if (Interpreter.clientPreferences.parameters.size() >= 10 && !Interpreter.clientPreferences.parameters.containsKey(var16)) { + Iterator var26 = Interpreter.clientPreferences.parameters.entrySet().iterator(); + var26.next(); + var26.remove(); } + + Interpreter.clientPreferences.parameters.put(var16, var14); } if (Login_isUsernameRemembered) { - UserComparator10.clientPreferences.rememberedUsername = Login.Login_username; + Interpreter.clientPreferences.rememberedUsername = Login.Login_username; } else { - UserComparator10.clientPreferences.rememberedUsername = null; + Interpreter.clientPreferences.rememberedUsername = null; } - class40.savePreferences(); + FriendSystem.savePreferences(); staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); localPlayerIndex <<= 8; localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); - field789 = ((AbstractSocket)var1).readUnsignedByte(); + field746 = ((AbstractSocket)var1).readUnsignedByte(); ((AbstractSocket)var1).read(var2.array, 0, 1); var2.offset = 0; - ServerPacket[] var25 = WorldMapLabelSize.ServerPacket_values(); - var14 = var2.readSmartByteShortIsaac(); - if (var14 < 0 || var14 >= var25.length) { - throw new IOException(var14 + " " + var2.offset); + ServerPacket[] var5 = class162.ServerPacket_values(); + int var17 = var2.readSmartByteShortIsaac(); + if (var17 < 0 || var17 >= var5.length) { + throw new IOException(var17 + " " + var2.offset); } - packetWriter.serverPacket = var25[var14]; + packetWriter.serverPacket = var5[var17]; packetWriter.serverPacketLength = packetWriter.serverPacket.length; ((AbstractSocket)var1).read(var2.array, 0, 2); var2.offset = 0; packetWriter.serverPacketLength = var2.readUnsignedShort(); try { - class47.method864(AbstractWorldMapIcon.client, "zap"); - } catch (Throwable var19) { + Client var7 = class206.client; + JSObject.getWindow(var7).call("zap", (Object[])null); + } catch (Throwable var18) { } loginState = 13; } - if (loginState == 13) { - if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { - var2.offset = 0; - ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); - timer.method5079(); - mouseLastLastPressedTimeMillis = 1L; - class2.mouseRecorder.index = 0; - TextureProvider.hasFocus = true; - hadFocus = true; - field866 = -1L; - ArchiveLoader.method1178(); - packetWriter.clearBuffer(); - packetWriter.packetBuffer.offset = 0; - packetWriter.serverPacket = null; - packetWriter.field1299 = null; - packetWriter.field1311 = null; - packetWriter.field1312 = null; - packetWriter.serverPacketLength = 0; - packetWriter.field1305 = 0; - rebootTimer = 0; - logoutTimer = 0; - hintArrowType = 0; - RouteStrategy.method3641(); - class4.method56(0); - AbstractWorldMapIcon.method623(); - isItemSelected = 0; - isSpellSelected = false; - soundEffectCount = 0; - camAngleY = 0; - oculusOrbState = 0; - InvDefinition.field3210 = null; - minimapState = 0; - field867 = -1; - destinationX = 0; - destinationY = 0; - playerAttackOption = AttackOption.AttackOption_hidden; - npcAttackOption = AttackOption.AttackOption_hidden; - npcCount = 0; - class42.method809(); - - for (var31 = 0; var31 < 2048; ++var31) { - players[var31] = null; - } - - for (var31 = 0; var31 < 32768; ++var31) { - npcs[var31] = null; - } - - combatTargetPlayerIndex = -1; - projectiles.clear(); - graphicsObjects.clear(); - - for (var31 = 0; var31 < 4; ++var31) { - for (var4 = 0; var4 < 104; ++var4) { - for (int var17 = 0; var17 < 104; ++var17) { - groundItems[var31][var4][var17] = null; - } - } - } - - pendingSpawns = new NodeDeque(); - VertexNormal.friendSystem.clear(); - - for (var31 = 0; var31 < VarpDefinition.VarpDefinition_fileCount; ++var31) { - VarpDefinition var34 = NetCache.VarpDefinition_get(var31); - if (var34 != null) { - Varps.Varps_temp[var31] = 0; - Varps.Varps_main[var31] = 0; - } - } - - AttackOption.varcs.clearTransient(); - followerIndex = -1; - if (rootInterface != -1) { - DynamicObject.method2263(rootInterface); - } - - for (InterfaceParent var23 = (InterfaceParent)interfaceParents.first(); var23 != null; var23 = (InterfaceParent)interfaceParents.next()) { - class43.closeInterface(var23, true); - } - - rootInterface = -1; - interfaceParents = new NodeHashTable(8); - meslayerContinueWidget = null; - RouteStrategy.method3641(); - playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); - - for (var31 = 0; var31 < 8; ++var31) { - playerMenuActions[var31] = null; - playerOptionsPriorities[var31] = false; - } - - ItemContainer.itemContainers = new NodeHashTable(32); - isLoading = true; - - for (var31 = 0; var31 < 100; ++var31) { - field847[var31] = true; - } - - var3 = ModelData0.getPacketBufferNode(ClientPacket.field2218, packetWriter.isaacCipher); - var3.packetBuffer.writeByte(class43.getWindowedMode()); - var3.packetBuffer.writeShort(BoundaryObject.canvasWidth); - var3.packetBuffer.writeShort(WorldMapCacheName.canvasHeight); - packetWriter.addNode(var3); - InterfaceParent.clanChat = null; - - for (var31 = 0; var31 < 8; ++var31) { - grandExchangeOffers[var31] = new GrandExchangeOffer(); - } - - SoundCache.grandExchangeEvents = null; - UserComparator6.updatePlayer(var2); - CollisionMap.field2086 = -1; - WorldMapRegion.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; - AbstractWorldMapIcon.field292 = var2.readUnsignedShort(); + WorldMapDecoration.field195 = var2.readUnsignedShort(); loginState = 15; } - if (loginState == 15 && ((AbstractSocket)var1).available() >= AbstractWorldMapIcon.field292) { + if (loginState == 15 && ((AbstractSocket)var1).available() >= WorldMapDecoration.field195) { var2.offset = 0; - ((AbstractSocket)var1).read(var2.array, 0, AbstractWorldMapIcon.field292); + ((AbstractSocket)var1).read(var2.array, 0, WorldMapDecoration.field195); var2.offset = 0; - String var22 = var2.readStringCp1252NullTerminated(); - String var32 = var2.readStringCp1252NullTerminated(); - String var26 = var2.readStringCp1252NullTerminated(); - PacketWriter.setLoginResponseString(var22, var32, var26); - class81.updateGameState(10); + String var21 = var2.readStringCp1252NullTerminated(); + String var25 = var2.readStringCp1252NullTerminated(); + String var23 = var2.readStringCp1252NullTerminated(); + AbstractWorldMapData.setLoginResponseString(var21, var25, var23); + class195.updateGameState(10); } - if (loginState != 16) { - ++field887; - if (field887 > 2000) { - if (field678 < 1) { - if (WorldMapIcon_0.port3 == SecureRandomCallable.port1) { - WorldMapIcon_0.port3 = class49.port2; - } else { - WorldMapIcon_0.port3 = SecureRandomCallable.port1; - } - - ++field678; - loginState = 0; - } else { - class162.getLoginError(-3); - } - } - } else { + if (loginState == 16) { if (packetWriter.serverPacketLength == -1) { if (((AbstractSocket)var1).available() < 2) { return; @@ -2930,75 +3165,166 @@ 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; - var31 = packetWriter.serverPacketLength; - timer.method5076(); - packetWriter.clearBuffer(); - packetWriter.packetBuffer.offset = 0; - packetWriter.serverPacket = null; - packetWriter.field1299 = null; - packetWriter.field1311 = null; - packetWriter.field1312 = null; - packetWriter.serverPacketLength = 0; - packetWriter.field1305 = 0; - rebootTimer = 0; - RouteStrategy.method3641(); - minimapState = 0; - destinationX = 0; - - for (var4 = 0; var4 < 2048; ++var4) { - players[var4] = null; - } - - class215.localPlayer = null; - - for (var4 = 0; var4 < npcs.length; ++var4) { - NPC var27 = npcs[var4]; - if (var27 != null) { - var27.targetIndex = -1; - var27.false0 = false; - } - } - - ItemContainer.itemContainers = new NodeHashTable(32); - class81.updateGameState(30); - - for (var4 = 0; var4 < 100; ++var4) { - field847[var4] = true; - } - - PacketBufferNode var33 = ModelData0.getPacketBufferNode(ClientPacket.field2218, packetWriter.isaacCipher); - var33.packetBuffer.writeByte(class43.getWindowedMode()); - var33.packetBuffer.writeShort(BoundaryObject.canvasWidth); - var33.packetBuffer.writeShort(WorldMapCacheName.canvasHeight); - packetWriter.addNode(var33); - UserComparator6.updatePlayer(var2); - if (var31 != var2.offset) { + var28 = packetWriter.serverPacketLength; + timer.method5020(); + Interpreter.method2020(); + GraphicsObject.updatePlayer(var2); + if (var28 != var2.offset) { throw new RuntimeException(); } } + } else { + ++field663; + if (field663 > 2000) { + if (field740 < 1) { + if (class197.port1 == WorldMapData_1.port3) { + WorldMapData_1.port3 = MouseRecorder.port2; + } else { + WorldMapData_1.port3 = class197.port1; + } + + ++field740; + loginState = 0; + } else { + ModelData0.getLoginError(-3); + } + } } + } else { + if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { + var2.offset = 0; + ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); + timer.method5037(); + mouseLastLastPressedTimeMillis = 1L; + class173.mouseRecorder.index = 0; + GameShell.hasFocus = true; + hadFocus = true; + field852 = -1L; + GrandExchangeOfferAgeComparator.method147(); + packetWriter.clearBuffer(); + packetWriter.packetBuffer.offset = 0; + packetWriter.serverPacket = null; + packetWriter.field1300 = null; + packetWriter.field1301 = null; + packetWriter.field1299 = null; + packetWriter.serverPacketLength = 0; + packetWriter.field1298 = 0; + rebootTimer = 0; + logoutTimer = 0; + hintArrowType = 0; + WorldMapData_1.method708(); + MouseHandler.MouseHandler_idleCycles = 0; + class54.method1105(); + isItemSelected = 0; + isSpellSelected = false; + soundEffectCount = 0; + camAngleY = 0; + oculusOrbState = 0; + class215.field2534 = null; + minimapState = 0; + field853 = -1; + destinationX = 0; + destinationY = 0; + playerAttackOption = AttackOption.AttackOption_hidden; + npcAttackOption = AttackOption.AttackOption_hidden; + npcCount = 0; + LoginScreenAnimation.method1831(); + + for (var28 = 0; var28 < 2048; ++var28) { + players[var28] = null; + } + + for (var28 = 0; var28 < 32768; ++var28) { + npcs[var28] = null; + } + + combatTargetPlayerIndex = -1; + projectiles.clear(); + graphicsObjects.clear(); + + for (var28 = 0; var28 < 4; ++var28) { + for (var14 = 0; var14 < 104; ++var14) { + for (var16 = 0; var16 < 104; ++var16) { + groundItems[var28][var14][var16] = null; + } + } + } + + pendingSpawns = new NodeDeque(); + Message.friendSystem.clear(); + + for (var28 = 0; var28 < VarpDefinition.VarpDefinition_fileCount; ++var28) { + VarpDefinition var24 = UserComparator8.VarpDefinition_get(var28); + if (var24 != null) { + Varps.Varps_temp[var28] = 0; + Varps.Varps_main[var28] = 0; + } + } + + MilliClock.varcs.clearTransient(); + followerIndex = -1; + if (rootInterface != -1) { + ItemDefinition.method4715(rootInterface); + } + + for (InterfaceParent var20 = (InterfaceParent)interfaceParents.first(); var20 != null; var20 = (InterfaceParent)interfaceParents.next()) { + VarpDefinition.closeInterface(var20, true); + } + + rootInterface = -1; + interfaceParents = new NodeHashTable(8); + meslayerContinueWidget = null; + WorldMapData_1.method708(); + playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); + + for (var28 = 0; var28 < 8; ++var28) { + playerMenuActions[var28] = null; + playerOptionsPriorities[var28] = false; + } + + ItemContainer.itemContainers = new NodeHashTable(32); + isLoading = true; + + for (var28 = 0; var28 < 100; ++var28) { + field833[var28] = true; + } + + class219.method4076(); + Calendar.clanChat = null; + + for (var28 = 0; var28 < 8; ++var28) { + grandExchangeOffers[var28] = new GrandExchangeOffer(); + } + + Script.grandExchangeEvents = null; + GraphicsObject.updatePlayer(var2); + GrandExchangeOfferTotalQuantityComparator.field47 = -1; + SecureRandomCallable.loadRegions(false, var2); + packetWriter.serverPacket = null; + } + } } - } catch (IOException var20) { - if (field678 < 1) { - if (SecureRandomCallable.port1 == WorldMapIcon_0.port3) { - WorldMapIcon_0.port3 = class49.port2; + } catch (IOException var19) { + if (field740 < 1) { + if (WorldMapData_1.port3 == class197.port1) { + WorldMapData_1.port3 = MouseRecorder.port2; } else { - WorldMapIcon_0.port3 = SecureRandomCallable.port1; + WorldMapData_1.port3 = class197.port1; } - ++field678; + ++field740; loginState = 0; } else { - class162.getLoginError(-2); + ModelData0.getLoginError(-2); } } } - @ObfuscatedName("fu") + @ObfuscatedName("ft") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1256997578" + garbageValue = "-1040465625" ) @Export("doCycleLoggedIn") final void doCycleLoggedIn() { @@ -3010,37 +3336,38 @@ public final class Client extends GameShell implements Usernamed { --logoutTimer; } - if (field691) { - field691 = false; - Projectile.method2137(); + if (field677) { + field677 = false; + StudioGame.method4119(); } else { if (!isMenuOpen) { - class2.addCancelMenuEntry(); + Actor.addCancelMenuEntry(); } - for (int var1 = 0; var1 < 100 && this.method1316(packetWriter); ++var1) { + int var1; + for (var1 = 0; var1 < 100 && this.method1304(packetWriter); ++var1) { } if (gameState == 30) { int var2; PacketBufferNode var14; - while (class43.method820()) { - var14 = ModelData0.getPacketBufferNode(ClientPacket.field2283, packetWriter.isaacCipher); + while (class210.method3947()) { + var14 = class2.getPacketBufferNode(ClientPacket.field2187, packetWriter.isaacCipher); var14.packetBuffer.writeByte(0); var2 = var14.packetBuffer.offset; - UserComparator10.performReflectionCheck(var14.packetBuffer); + class60.performReflectionCheck(var14.packetBuffer); var14.packetBuffer.writeLengthByte(var14.packetBuffer.offset - var2); packetWriter.addNode(var14); } - if (timer.field3581) { - var14 = ModelData0.getPacketBufferNode(ClientPacket.field2302, packetWriter.isaacCipher); + if (timer.field3555) { + var14 = class2.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.method5075(); + timer.method5039(); } int var3; @@ -3053,35 +3380,35 @@ public final class Client extends GameShell implements Usernamed { int var10; int var11; int var12; - synchronized(class2.mouseRecorder.lock) { - if (!field831) { - class2.mouseRecorder.index = 0; - } else if (MouseHandler.MouseHandler_lastButton != 0 || class2.mouseRecorder.index >= 40) { + synchronized(class173.mouseRecorder.lock) { + if (!field895) { + class173.mouseRecorder.index = 0; + } else if (MouseHandler.MouseHandler_lastButton != 0 || class173.mouseRecorder.index >= 40) { PacketBufferNode var15 = null; var3 = 0; var4 = 0; var5 = 0; var6 = 0; - for (var7 = 0; var7 < class2.mouseRecorder.index && (var15 == null || var15.packetBuffer.offset - var3 < 246); ++var7) { + for (var7 = 0; var7 < class173.mouseRecorder.index && (var15 == null || var15.packetBuffer.offset - var3 < 246); ++var7) { var4 = var7; - var8 = class2.mouseRecorder.ys[var7]; + var8 = class173.mouseRecorder.ys[var7]; if (var8 < -1) { var8 = -1; } else if (var8 > 65534) { var8 = 65534; } - var9 = class2.mouseRecorder.xs[var7]; + var9 = class173.mouseRecorder.xs[var7]; if (var9 < -1) { var9 = -1; } else if (var9 > 65534) { var9 = 65534; } - if (var9 != field877 || var8 != field657) { + if (var9 != field642 || var8 != field681) { if (var15 == null) { - var15 = ModelData0.getPacketBufferNode(ClientPacket.field2221, packetWriter.isaacCipher); + var15 = class2.getPacketBufferNode(ClientPacket.field2225, packetWriter.isaacCipher); var15.packetBuffer.writeByte(0); var3 = var15.packetBuffer.offset; PacketBuffer var10000 = var15.packetBuffer; @@ -3090,19 +3417,19 @@ public final class Client extends GameShell implements Usernamed { var6 = 0; } - if (field658 != -1L) { - var10 = var9 - field877; - var11 = var8 - field657; - var12 = (int)((class2.mouseRecorder.millis[var7] - field658) / 20L); - var5 = (int)((long)var5 + (class2.mouseRecorder.millis[var7] - field658) % 20L); + if (-1L != field728) { + var10 = var9 - field642; + var11 = var8 - field681; + var12 = (int)((class173.mouseRecorder.millis[var7] - field728) / 20L); + var5 = (int)((long)var5 + (class173.mouseRecorder.millis[var7] - field728) % 20L); } else { var10 = var9; var11 = var8; var12 = Integer.MAX_VALUE; } - field877 = var9; - field657 = var8; + field642 = var9; + field681 = var8; if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { var10 += 32; var11 += 32; @@ -3129,7 +3456,7 @@ public final class Client extends GameShell implements Usernamed { } ++var6; - field658 = class2.mouseRecorder.millis[var7]; + field728 = class173.mouseRecorder.millis[var7]; } } @@ -3143,539 +3470,516 @@ public final class Client extends GameShell implements Usernamed { packetWriter.addNode(var15); } - if (var4 >= class2.mouseRecorder.index) { - class2.mouseRecorder.index = 0; + if (var4 >= class173.mouseRecorder.index) { + class173.mouseRecorder.index = 0; } else { - MouseRecorder var47 = class2.mouseRecorder; - var47.index -= var4; - System.arraycopy(class2.mouseRecorder.xs, var4, class2.mouseRecorder.xs, 0, class2.mouseRecorder.index); - System.arraycopy(class2.mouseRecorder.ys, var4, class2.mouseRecorder.ys, 0, class2.mouseRecorder.index); - System.arraycopy(class2.mouseRecorder.millis, var4, class2.mouseRecorder.millis, 0, class2.mouseRecorder.index); + MouseRecorder var46 = class173.mouseRecorder; + var46.index -= var4; + System.arraycopy(class173.mouseRecorder.xs, var4, class173.mouseRecorder.xs, 0, class173.mouseRecorder.index); + System.arraycopy(class173.mouseRecorder.ys, var4, class173.mouseRecorder.ys, 0, class173.mouseRecorder.index); + System.arraycopy(class173.mouseRecorder.millis, var4, class173.mouseRecorder.millis, 0, class173.mouseRecorder.index); } } } - if (MouseHandler.MouseHandler_lastButton == 1 || !JagexCache.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { - long var16 = (MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis * -1L) / 50L; - if (var16 > 4095L) { - var16 = 4095L; + PacketBufferNode var18; + if (MouseHandler.MouseHandler_lastButton == 1 || !NetFileRequest.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { + long var16 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis * -1L; + if (var16 > 32767L) { + var16 = 32767L; } mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis * -1L; var3 = MouseHandler.MouseHandler_lastPressedY; if (var3 < 0) { var3 = 0; - } else if (var3 > WorldMapCacheName.canvasHeight) { - var3 = WorldMapCacheName.canvasHeight; + } else if (var3 > AttackOption.canvasHeight) { + var3 = AttackOption.canvasHeight; } var4 = MouseHandler.MouseHandler_lastPressedX; if (var4 < 0) { var4 = 0; - } else if (var4 > BoundaryObject.canvasWidth) { - var4 = BoundaryObject.canvasWidth; + } else if (var4 > GrandExchangeOfferTotalQuantityComparator.canvasWidth) { + var4 = GrandExchangeOfferTotalQuantityComparator.canvasWidth; } var5 = (int)var16; - PacketBufferNode var18 = ModelData0.getPacketBufferNode(ClientPacket.field2224, packetWriter.isaacCipher); - var18.packetBuffer.writeShort((MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0) + (var5 << 1)); + var18 = class2.getPacketBufferNode(ClientPacket.field2241, packetWriter.isaacCipher); + var18.packetBuffer.writeShort((var5 << 1) + (MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0)); var18.packetBuffer.writeShort(var4); var18.packetBuffer.writeShort(var3); packetWriter.addNode(var18); } - if (KeyHandler.field398 > 0) { - var14 = ModelData0.getPacketBufferNode(ClientPacket.field2281, packetWriter.isaacCipher); + if (KeyHandler.field377 > 0) { + var14 = class2.getPacketBufferNode(ClientPacket.field2202, packetWriter.isaacCipher); var14.packetBuffer.writeShort(0); var2 = var14.packetBuffer.offset; - long var19 = TaskHandler.currentTimeMillis(); + long var19 = WorldMapID.currentTimeMillis(); - for (var5 = 0; var5 < KeyHandler.field398; ++var5) { - long var21 = var19 - field866; + for (var5 = 0; var5 < KeyHandler.field377; ++var5) { + long var21 = var19 - field852; if (var21 > 16777215L) { var21 = 16777215L; } - field866 = var19; - var14.packetBuffer.method5627((int)var21); - var14.packetBuffer.writeIntME(KeyHandler.field378[var5]); + field852 = var19; + var14.packetBuffer.method5569(KeyHandler.field376[var5]); + var14.packetBuffer.method5586((int)var21); } var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var2); packetWriter.addNode(var14); } - if (field776 > 0) { - --field776; + if (field712 > 0) { + --field712; } if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { - field727 = true; + field713 = true; } - if (field727 && field776 <= 0) { - field776 = 20; - field727 = false; - var14 = ModelData0.getPacketBufferNode(ClientPacket.field2295, packetWriter.isaacCipher); - var14.packetBuffer.writeShortLE(camAngleX); - var14.packetBuffer.writeShort(camAngleY); + if (field713 && field712 <= 0) { + field712 = 20; + field713 = false; + var14 = class2.getPacketBufferNode(ClientPacket.field2193, packetWriter.isaacCipher); + var14.packetBuffer.method5579(camAngleY); + var14.packetBuffer.method5579(camAngleX); packetWriter.addNode(var14); } - if (TextureProvider.hasFocus && !hadFocus) { + if (GameShell.hasFocus && !hadFocus) { hadFocus = true; - var14 = ModelData0.getPacketBufferNode(ClientPacket.field2309, packetWriter.isaacCipher); + var14 = class2.getPacketBufferNode(ClientPacket.field2229, packetWriter.isaacCipher); var14.packetBuffer.writeByte(1); packetWriter.addNode(var14); } - if (!TextureProvider.hasFocus && hadFocus) { + if (!GameShell.hasFocus && hadFocus) { hadFocus = false; - var14 = ModelData0.getPacketBufferNode(ClientPacket.field2309, packetWriter.isaacCipher); + var14 = class2.getPacketBufferNode(ClientPacket.field2229, packetWriter.isaacCipher); var14.packetBuffer.writeByte(0); packetWriter.addNode(var14); } - if (WorldMapRegion.worldMap != null) { - WorldMapRegion.worldMap.method6376(); + if (GrandExchangeEvent.worldMap != null) { + GrandExchangeEvent.worldMap.method6357(); } - class222.method4198(); - GrandExchangeOfferNameComparator.method157(); + Script.method2244(); + SoundCache.method2509(); if (gameState == 30) { - for (PendingSpawn var35 = (PendingSpawn)pendingSpawns.last(); var35 != null; var35 = (PendingSpawn)pendingSpawns.previous()) { - if (var35.hitpoints > 0) { - --var35.hitpoints; + for (PendingSpawn var36 = (PendingSpawn)pendingSpawns.last(); var36 != null; var36 = (PendingSpawn)pendingSpawns.previous()) { + if (var36.hitpoints > 0) { + --var36.hitpoints; } - ObjectDefinition var23; - boolean var30; - if (var35.hitpoints == 0) { - if (var35.objectId >= 0) { - var3 = var35.objectId; - var4 = var35.field924; - var23 = Occluder.getObjectDefinition(var3); - if (var4 == 11) { - var4 = 10; - } - - if (var4 >= 5 && var4 <= 8) { - var4 = 4; - } - - var30 = var23.method4691(var4); - if (!var30) { - continue; - } + if (var36.hitpoints == 0) { + if (var36.objectId < 0 || StructDefinition.method4546(var36.objectId, var36.field912)) { + VarcInt.addPendingSpawnToScene(var36.plane, var36.type, var36.x, var36.y, var36.objectId, var36.field911, var36.field912); + var36.remove(); } - - Actor.addPendingSpawnToScene(var35.plane, var35.type, var35.x, var35.y, var35.objectId, var35.field929, var35.field924); - var35.remove(); } else { - if (var35.delay > 0) { - --var35.delay; + if (var36.delay > 0) { + --var36.delay; } - if (var35.delay == 0 && var35.x >= 1 && var35.y >= 1 && var35.x <= 102 && var35.y <= 102) { - if (var35.id >= 0) { - var3 = var35.id; - var4 = var35.field927; - var23 = Occluder.getObjectDefinition(var3); - if (var4 == 11) { - var4 = 10; - } - - if (var4 >= 5 && var4 <= 8) { - var4 = 4; - } - - var30 = var23.method4691(var4); - if (!var30) { - continue; - } - } - - Actor.addPendingSpawnToScene(var35.plane, var35.type, var35.x, var35.y, var35.id, var35.orientation, var35.field927); - var35.delay = -1; - if (var35.objectId == var35.id && var35.objectId == -1) { - var35.remove(); - } else if (var35.id == var35.objectId && var35.orientation == var35.field929 && var35.field927 == var35.field924) { - var35.remove(); + if (var36.delay == 0 && var36.x >= 1 && var36.y >= 1 && var36.x <= 102 && var36.y <= 102 && (var36.id < 0 || StructDefinition.method4546(var36.id, var36.field918))) { + VarcInt.addPendingSpawnToScene(var36.plane, var36.type, var36.x, var36.y, var36.id, var36.orientation, var36.field918); + var36.delay = -1; + if (var36.id == var36.objectId && var36.objectId == -1) { + var36.remove(); + } else if (var36.id == var36.objectId && var36.orientation == var36.field911 && var36.field918 == var36.field912) { + var36.remove(); } } } } - class81.method2084(); - ++packetWriter.field1305; - if (packetWriter.field1305 > 750) { - Projectile.method2137(); + WorldMapID.method546(); + ++packetWriter.field1298; + if (packetWriter.field1298 > 750) { + StudioGame.method4119(); } else { - class81.method2085(); - GrandExchangeEvents.method83(); - int[] var36 = Players.Players_indices; + var1 = Players.Players_count; + int[] var38 = Players.Players_indices; - for (var2 = 0; var2 < Players.Players_count; ++var2) { - Player var24 = players[var36[var2]]; - if (var24 != null && var24.overheadTextCyclesRemaining > 0) { - --var24.overheadTextCyclesRemaining; - if (var24.overheadTextCyclesRemaining == 0) { - var24.overheadText = null; - } + for (var3 = 0; var3 < var1; ++var3) { + Player var23 = players[var38[var3]]; + if (var23 != null) { + Message.updateActorSequence(var23, 1); } } - for (var2 = 0; var2 < npcCount; ++var2) { - var3 = npcIndices[var2]; - NPC var25 = npcs[var3]; - if (var25 != null && var25.overheadTextCyclesRemaining > 0) { - --var25.overheadTextCyclesRemaining; - if (var25.overheadTextCyclesRemaining == 0) { - var25.overheadText = null; - } + for (var1 = 0; var1 < npcCount; ++var1) { + var2 = npcIndices[var1]; + NPC var24 = npcs[var2]; + if (var24 != null) { + Message.updateActorSequence(var24, var24.definition.size); } } - ++field704; + class269.method5014(); + ++field690; if (mouseCrossColor != 0) { - mouseCrossState = mouseCrossState * 400 + 20; - if (mouseCrossState * 400 >= 400) { + mouseCrossState = mouseCrossState * 400 + 400; + if (mouseCrossState * 20 >= 400) { mouseCrossColor = 0; } } - if (class51.field432 != null) { - ++field664; - if (field664 >= 15) { - ScriptEvent.invalidateWidget(class51.field432); - class51.field432 = null; + if (class192.field2372 != null) { + ++field764; + if (field764 >= 15) { + LoginPacket.invalidateWidget(class192.field2372); + class192.field2372 = null; } } - Widget var37 = class185.mousedOverWidgetIf1; - Widget var38 = GrandExchangeOfferWorldComparator.field31; - class185.mousedOverWidgetIf1 = null; - GrandExchangeOfferWorldComparator.field31 = null; + Widget var37 = class16.mousedOverWidgetIf1; + Widget var39 = class14.field90; + class16.mousedOverWidgetIf1 = null; + class14.field90 = null; draggedOnWidget = null; - field823 = false; - field820 = false; - field889 = 0; + field809 = false; + field806 = false; + field849 = 0; - while (InvDefinition.isKeyDown() && field889 < 128) { - if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && class49.field418 == 66) { - String var44 = ""; + while (KeyHandler.isKeyDown() && field849 < 128) { + if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && VertexNormal.field1732 == 66) { + String var42 = ""; - Message var39; - for (Iterator var40 = Messages.Messages_hashTable.iterator(); var40.hasNext(); var44 = var44 + var39.sender + ':' + var39.text + '\n') { - var39 = (Message)var40.next(); + Message var40; + for (Iterator var25 = Messages.Messages_hashTable.iterator(); var25.hasNext(); var42 = var42 + var40.sender + ':' + var40.text + '\n') { + var40 = (Message)var25.next(); } - AbstractWorldMapIcon.client.clipboardSetString(var44); - } else if (oculusOrbState != 1 || class297.field3699 <= 0) { - field865[field889] = class49.field418; - field864[field889] = class297.field3699; - ++field889; + class206.client.clipboardSetString(var42); + } else if (oculusOrbState != 1 || TileItemPile.field1521 <= 0) { + field851[field849] = VertexNormal.field1732; + field850[field849] = TileItemPile.field1521; + ++field849; } } - if (WorldMapSection0.method254() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { - var3 = class215.localPlayer.plane - mouseWheelRotation; - if (var3 < 0) { - var3 = 0; - } else if (var3 > 3) { - var3 = 3; + boolean var31 = staffModLevel >= 2; + PacketBufferNode var26; + if (var31 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { + var4 = Message.localPlayer.plane - mouseWheelRotation; + if (var4 < 0) { + var4 = 0; + } else if (var4 > 3) { + var4 = 3; } - if (var3 != class215.localPlayer.plane) { - Clock.method3555(class215.localPlayer.pathX[0] + class51.baseX * 64, class215.localPlayer.pathY[0] + VarcInt.baseY * 64, var3, false); + if (var4 != Message.localPlayer.plane) { + var5 = Message.localPlayer.pathX[0] + MusicPatchPcmStream.baseX * 64; + var6 = Message.localPlayer.pathY[0] + ScriptEvent.baseY * 64; + var26 = class2.getPacketBufferNode(ClientPacket.field2251, packetWriter.isaacCipher); + var26.packetBuffer.writeIntME(var5); + var26.packetBuffer.writeShortLE(0); + var26.packetBuffer.writeIntME(var6); + var26.packetBuffer.method5569(var4); + packetWriter.addNode(var26); } mouseWheelRotation = 0; } if (rootInterface != -1) { - Script.updateRootInterface(rootInterface, 0, 0, BoundaryObject.canvasWidth, WorldMapCacheName.canvasHeight, 0, 0); + Buffer.updateRootInterface(rootInterface, 0, 0, GrandExchangeOfferTotalQuantityComparator.canvasWidth, AttackOption.canvasHeight, 0, 0); } ++cycleCntr; while (true) { Widget var41; - ScriptEvent var42; - Widget var46; + ScriptEvent var43; + Widget var45; do { - var42 = (ScriptEvent)field900.removeLast(); - if (var42 == null) { + var43 = (ScriptEvent)field865.removeLast(); + if (var43 == null) { while (true) { do { - var42 = (ScriptEvent)field843.removeLast(); - if (var42 == null) { + var43 = (ScriptEvent)field883.removeLast(); + if (var43 == null) { while (true) { do { - var42 = (ScriptEvent)scriptEvents.removeLast(); - if (var42 == null) { + var43 = (ScriptEvent)scriptEvents.removeLast(); + if (var43 == null) { this.menu(); - if (WorldMapRegion.worldMap != null) { - WorldMapRegion.worldMap.method6381(ClientPacket.Client_plane, class51.baseX * 64 + (class215.localPlayer.x >> 7), VarcInt.baseY * 64 + (class215.localPlayer.y >> 7), false); - WorldMapRegion.worldMap.loadCache(); - } - + WorldMapSection1.method584(); if (clickedWidget != null) { - this.method1503(); + this.method1310(); } - PacketBufferNode var26; - if (DevicePcmPlayerProvider.dragInventoryWidget != null) { - ScriptEvent.invalidateWidget(DevicePcmPlayerProvider.dragInventoryWidget); + if (ClientPreferences.dragInventoryWidget != null) { + LoginPacket.invalidateWidget(ClientPreferences.dragInventoryWidget); ++itemDragDuration; if (MouseHandler.MouseHandler_currentButton == 0) { - if (field754) { - if (DevicePcmPlayerProvider.dragInventoryWidget == FloorOverlayDefinition.field3507 && dragItemSlotSource != dragItemSlotDestination) { - Widget var45 = DevicePcmPlayerProvider.dragInventoryWidget; + if (field768) { + if (ClientPreferences.dragInventoryWidget == WorldMapManager.field312 && dragItemSlotDestination != dragItemSlotSource) { + Widget var44 = ClientPreferences.dragInventoryWidget; byte var33 = 0; - if (field807 == 1 && var45.contentType == 206) { + if (field901 == 1 && var44.contentType == 206) { var33 = 1; } - if (var45.itemIds[dragItemSlotDestination] <= 0) { + if (var44.itemIds[dragItemSlotDestination] <= 0) { var33 = 0; } - var6 = MenuAction.getWidgetClickMask(var45); - boolean var31 = (var6 >> 29 & 1) != 0; - if (var31) { - var7 = dragItemSlotSource; - var8 = dragItemSlotDestination; - var45.itemIds[var8] = var45.itemIds[var7]; - var45.itemQuantities[var8] = var45.itemQuantities[var7]; - var45.itemIds[var7] = -1; - var45.itemQuantities[var7] = 0; + var7 = WorldMapSection0.getWidgetClickMask(var44); + boolean var32 = (var7 >> 29 & 1) != 0; + if (var32) { + var8 = dragItemSlotSource; + var9 = dragItemSlotDestination; + var44.itemIds[var9] = var44.itemIds[var8]; + var44.itemQuantities[var9] = var44.itemQuantities[var8]; + var44.itemIds[var8] = -1; + var44.itemQuantities[var8] = 0; } else if (var33 == 1) { - var7 = dragItemSlotSource; - var8 = dragItemSlotDestination; + var8 = dragItemSlotSource; + var9 = dragItemSlotDestination; - while (var7 != var8) { - if (var7 > var8) { - var45.swapItems(var7 - 1, var7); - --var7; - } else if (var7 < var8) { - var45.swapItems(var7 + 1, var7); - ++var7; + while (var8 != var9) { + if (var8 > var9) { + var44.swapItems(var8 - 1, var8); + --var8; + } else if (var8 < var9) { + var44.swapItems(var8 + 1, var8); + ++var8; } } } else { - var45.swapItems(dragItemSlotDestination, dragItemSlotSource); + var44.swapItems(dragItemSlotDestination, dragItemSlotSource); } - var26 = ModelData0.getPacketBufferNode(ClientPacket.field2271, packetWriter.isaacCipher); - var26.packetBuffer.method5647(DevicePcmPlayerProvider.dragInventoryWidget.id); - var26.packetBuffer.writeByte(var33); - var26.packetBuffer.writeShortLE(dragItemSlotDestination); - var26.packetBuffer.method5636(dragItemSlotSource); - packetWriter.addNode(var26); + PacketBufferNode var27 = class2.getPacketBufferNode(ClientPacket.field2183, packetWriter.isaacCipher); + var27.packetBuffer.writeInt(ClientPreferences.dragInventoryWidget.id); + var27.packetBuffer.method5720(var33); + var27.packetBuffer.writeShort(dragItemSlotSource); + var27.packetBuffer.writeIntME(dragItemSlotDestination); + packetWriter.addNode(var27); } } else if (this.shouldLeftClickOpenMenu()) { - this.openMenu(field751, field752); + this.openMenu(field863, field738); } else if (menuOptionsCount > 0) { - var3 = field751; - var4 = field752; - Language.method3705(Tiles.tempMenuAction, var3, var4); - Tiles.tempMenuAction = null; + var4 = field863; + var5 = field738; + Messages.method2231(LoginType.tempMenuAction, var4, var5); + LoginType.tempMenuAction = null; } - field664 = 10; + field764 = 10; MouseHandler.MouseHandler_lastButton = 0; - DevicePcmPlayerProvider.dragInventoryWidget = null; - } else if (itemDragDuration >= 5 && (MouseHandler.MouseHandler_x > field751 + 5 || MouseHandler.MouseHandler_x < field751 - 5 || MouseHandler.MouseHandler_y > field752 + 5 || MouseHandler.MouseHandler_y < field752 - 5)) { - field754 = true; + ClientPreferences.dragInventoryWidget = null; + } else if (itemDragDuration >= 5 && (MouseHandler.MouseHandler_x > field863 + 5 || MouseHandler.MouseHandler_x < field863 - 5 || MouseHandler.MouseHandler_y > field738 + 5 || MouseHandler.MouseHandler_y < field738 - 5)) { + field768 = true; } } - if (Scene.method3146()) { - var3 = Scene.Scene_selectedX; - var4 = Scene.Scene_selectedY; - PacketBufferNode var43 = ModelData0.getPacketBufferNode(ClientPacket.field2266, packetWriter.isaacCipher); - var43.packetBuffer.writeByte(5); - var43.packetBuffer.method5636(class51.baseX * 64 + var3); - var43.packetBuffer.method5628(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); - var43.packetBuffer.method5636(VarcInt.baseY * 64 + var4); - packetWriter.addNode(var43); - Scene.method3147(); + if (Scene.method3092()) { + var4 = Scene.Scene_selectedX; + var5 = Scene.Scene_selectedY; + var18 = class2.getPacketBufferNode(ClientPacket.field2278, packetWriter.isaacCipher); + var18.packetBuffer.writeByte(5); + var18.packetBuffer.method5696(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); + var18.packetBuffer.writeShort(MusicPatchPcmStream.baseX * 64 + var4); + var18.packetBuffer.writeIntME(ScriptEvent.baseY * 64 + var5); + packetWriter.addNode(var18); + Scene.method3150(); mouseCrossX = MouseHandler.MouseHandler_lastPressedX; mouseCrossY = MouseHandler.MouseHandler_lastPressedY; mouseCrossColor = 1; mouseCrossState = 0; - destinationX = var3; - destinationY = var4; + destinationX = var4; + destinationY = var5; } - if (var37 != class185.mousedOverWidgetIf1) { + if (var37 != class16.mousedOverWidgetIf1) { if (var37 != null) { - ScriptEvent.invalidateWidget(var37); + LoginPacket.invalidateWidget(var37); } - if (class185.mousedOverWidgetIf1 != null) { - ScriptEvent.invalidateWidget(class185.mousedOverWidgetIf1); + if (class16.mousedOverWidgetIf1 != null) { + LoginPacket.invalidateWidget(class16.mousedOverWidgetIf1); } } - if (var38 != GrandExchangeOfferWorldComparator.field31 && field643 == field768) { - if (var38 != null) { - ScriptEvent.invalidateWidget(var38); + if (var39 != class14.field90 && field674 == field798) { + if (var39 != null) { + LoginPacket.invalidateWidget(var39); } - if (GrandExchangeOfferWorldComparator.field31 != null) { - ScriptEvent.invalidateWidget(GrandExchangeOfferWorldComparator.field31); + if (class14.field90 != null) { + LoginPacket.invalidateWidget(class14.field90); } } - if (GrandExchangeOfferWorldComparator.field31 != null) { - if (field643 < field768) { - ++field643; - if (field768 == field643) { - ScriptEvent.invalidateWidget(GrandExchangeOfferWorldComparator.field31); + if (class14.field90 != null) { + if (field798 < field674) { + ++field798; + if (field674 == field798) { + LoginPacket.invalidateWidget(class14.field90); } } - } else if (field643 > 0) { - --field643; + } else if (field798 > 0) { + --field798; } if (oculusOrbState == 0) { - var3 = class215.localPlayer.x; - var4 = class215.localPlayer.y; - if (class80.oculusOrbFocalPointX - var3 < -500 || class80.oculusOrbFocalPointX - var3 > 500 || class81.oculusOrbFocalPointY - var4 < -500 || class81.oculusOrbFocalPointY - var4 > 500) { - class80.oculusOrbFocalPointX = var3; - class81.oculusOrbFocalPointY = var4; + var4 = Message.localPlayer.x; + var5 = Message.localPlayer.y; + if (WorldMapSectionType.oculusOrbFocalPointX - var4 < -500 || WorldMapSectionType.oculusOrbFocalPointX - var4 > 500 || Language.oculusOrbFocalPointY - var5 < -500 || Language.oculusOrbFocalPointY - var5 > 500) { + WorldMapSectionType.oculusOrbFocalPointX = var4; + Language.oculusOrbFocalPointY = var5; } - if (var3 != class80.oculusOrbFocalPointX) { - class80.oculusOrbFocalPointX += (var3 - class80.oculusOrbFocalPointX) / 16; + if (var4 != WorldMapSectionType.oculusOrbFocalPointX) { + WorldMapSectionType.oculusOrbFocalPointX += (var4 - WorldMapSectionType.oculusOrbFocalPointX) / 16; } - if (var4 != class81.oculusOrbFocalPointY) { - class81.oculusOrbFocalPointY += (var4 - class81.oculusOrbFocalPointY) / 16; + if (var5 != Language.oculusOrbFocalPointY) { + Language.oculusOrbFocalPointY += (var5 - Language.oculusOrbFocalPointY) / 16; } - var5 = class80.oculusOrbFocalPointX >> 7; - var6 = class81.oculusOrbFocalPointY >> 7; - var7 = class195.getTileHeight(class80.oculusOrbFocalPointX, class81.oculusOrbFocalPointY, ClientPacket.Client_plane); - var8 = 0; - if (var5 > 3 && var6 > 3 && var5 < 100 && var6 < 100) { - for (var9 = var5 - 4; var9 <= var5 + 4; ++var9) { - for (var10 = var6 - 4; var10 <= var6 + 4; ++var10) { - var11 = ClientPacket.Client_plane; - if (var11 < 3 && (Tiles.Tiles_renderFlags[1][var9][var10] & 2) == 2) { - ++var11; + var6 = WorldMapSectionType.oculusOrbFocalPointX >> 7; + var7 = Language.oculusOrbFocalPointY >> 7; + var8 = ScriptEvent.getTileHeight(WorldMapSectionType.oculusOrbFocalPointX, Language.oculusOrbFocalPointY, UrlRequest.Client_plane); + var9 = 0; + if (var6 > 3 && var7 > 3 && var6 < 100 && var7 < 100) { + for (var10 = var6 - 4; var10 <= var6 + 4; ++var10) { + for (var11 = var7 - 4; var11 <= var7 + 4; ++var11) { + var12 = UrlRequest.Client_plane; + if (var12 < 3 && (Tiles.Tiles_renderFlags[1][var10][var11] & 2) == 2) { + ++var12; } - var12 = var7 - Tiles.Tiles_heights[var11][var9][var10]; - if (var12 > var8) { - var8 = var12; + int var28 = var8 - Tiles.Tiles_heights[var12][var10][var11]; + if (var28 > var9) { + var9 = var28; } } } } - var9 = var8 * 192; - if (var9 > 98048) { - var9 = 98048; + var10 = var9 * 192; + if (var10 > 98048) { + var10 = 98048; } - if (var9 < 32768) { - var9 = 32768; + if (var10 < 32768) { + var10 = 32768; } - if (var9 > field728) { - field728 += (var9 - field728) / 24; - } else if (var9 < field728) { - field728 += (var9 - field728) / 80; + if (var10 > field714) { + field714 += (var10 - field714) / 24; + } else if (var10 < field714) { + field714 += (var10 - field714) / 80; } - GrandExchangeOfferAgeComparator.field78 = class195.getTileHeight(class215.localPlayer.x, class215.localPlayer.y, ClientPacket.Client_plane) - camFollowHeight; + WorldMapManager.field314 = ScriptEvent.getTileHeight(Message.localPlayer.x, Message.localPlayer.y, UrlRequest.Client_plane) - camFollowHeight; } else if (oculusOrbState == 1) { - JagexCache.method3539(); - short var32 = -1; + if (field751 && Message.localPlayer != null) { + var4 = Message.localPlayer.pathX[0]; + var5 = Message.localPlayer.pathY[0]; + if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { + WorldMapSectionType.oculusOrbFocalPointX = Message.localPlayer.x; + var6 = ScriptEvent.getTileHeight(Message.localPlayer.x, Message.localPlayer.y, UrlRequest.Client_plane) - camFollowHeight; + if (var6 < WorldMapManager.field314) { + WorldMapManager.field314 = var6; + } + + Language.oculusOrbFocalPointY = Message.localPlayer.y; + field751 = false; + } + } + + short var34 = -1; if (KeyHandler.KeyHandler_pressedKeys[33]) { - var32 = 0; + var34 = 0; } else if (KeyHandler.KeyHandler_pressedKeys[49]) { - var32 = 1024; + var34 = 1024; } if (KeyHandler.KeyHandler_pressedKeys[48]) { - if (var32 == 0) { - var32 = 1792; - } else if (var32 == 1024) { - var32 = 1280; + if (var34 == 0) { + var34 = 1792; + } else if (var34 == 1024) { + var34 = 1280; } else { - var32 = 1536; + var34 = 1536; } } else if (KeyHandler.KeyHandler_pressedKeys[50]) { - if (var32 == 0) { - var32 = 256; - } else if (var32 == 1024) { - var32 = 768; + if (var34 == 0) { + var34 = 256; + } else if (var34 == 1024) { + var34 = 768; } else { - var32 = 512; + var34 = 512; } } - byte var34 = 0; + byte var35 = 0; if (KeyHandler.KeyHandler_pressedKeys[35]) { - var34 = -1; + var35 = -1; } else if (KeyHandler.KeyHandler_pressedKeys[51]) { - var34 = 1; + var35 = 1; } - var5 = 0; - if (var32 >= 0 || var34 != 0) { - var5 = KeyHandler.KeyHandler_pressedKeys[81] ? oculusOrbSlowedSpeed : oculusOrbNormalSpeed; - var5 *= 16; - field720 = var32; - field818 = var34; + var6 = 0; + if (var34 >= 0 || var35 != 0) { + var6 = KeyHandler.KeyHandler_pressedKeys[81] ? oculusOrbSlowedSpeed : oculusOrbNormalSpeed; + var6 *= 16; + field706 = var34; + field632 = var35; } - if (field697 < var5) { - field697 += var5 / 8; - if (field697 > var5) { - field697 = var5; + if (field705 < var6) { + field705 += var6 / 8; + if (field705 > var6) { + field705 = var6; } - } else if (field697 > var5) { - field697 = field697 * 9 / 10; + } else if (field705 > var6) { + field705 = field705 * 9 / 10; } - if (field697 > 0) { - var6 = field697 / 16; - if (field720 >= 0) { - var3 = field720 - Decimator.cameraYaw & 2047; - var7 = Rasterizer3D.Rasterizer3D_sine[var3]; - var8 = Rasterizer3D.Rasterizer3D_cosine[var3]; - class80.oculusOrbFocalPointX += var7 * var6 / 65536; - class81.oculusOrbFocalPointY += var6 * var8 / 65536; + if (field705 > 0) { + var7 = field705 / 16; + if (field706 >= 0) { + var4 = field706 - WorldMapLabelSize.cameraYaw & 2047; + var8 = Rasterizer3D.Rasterizer3D_sine[var4]; + var9 = Rasterizer3D.Rasterizer3D_cosine[var4]; + WorldMapSectionType.oculusOrbFocalPointX += var8 * var7 / 65536; + Language.oculusOrbFocalPointY += var9 * var7 / 65536; } - if (field818 != 0) { - GrandExchangeOfferAgeComparator.field78 += var6 * field818; - if (GrandExchangeOfferAgeComparator.field78 > 0) { - GrandExchangeOfferAgeComparator.field78 = 0; + if (field632 != 0) { + WorldMapManager.field314 += var7 * field632; + if (WorldMapManager.field314 > 0) { + WorldMapManager.field314 = 0; } } } else { - field720 = -1; - field818 = -1; + field706 = -1; + field632 = -1; } if (KeyHandler.KeyHandler_pressedKeys[13]) { - WorldMapLabelSize.method208(); + class189.method3620(); } } - if (MouseHandler.MouseHandler_currentButton == 4 && JagexCache.mouseCam) { - var3 = MouseHandler.MouseHandler_y - mouseCamClickedY; - camAngleDX = var3 * 2; - mouseCamClickedY = var3 != -1 && var3 != 1 ? (MouseHandler.MouseHandler_y + mouseCamClickedY) / 2 : MouseHandler.MouseHandler_y; - var4 = mouseCamClickedX - MouseHandler.MouseHandler_x; - camAngleDY = var4 * 2; - mouseCamClickedX = var4 != -1 && var4 != 1 ? (mouseCamClickedX + MouseHandler.MouseHandler_x) / 2 : MouseHandler.MouseHandler_x; + if (MouseHandler.MouseHandler_currentButton == 4 && NetFileRequest.mouseCam) { + var4 = MouseHandler.MouseHandler_y - mouseCamClickedY; + camAngleDX = var4 * 2; + mouseCamClickedY = var4 != -1 && var4 != 1 ? (mouseCamClickedY + MouseHandler.MouseHandler_y) / 2 : MouseHandler.MouseHandler_y; + var5 = mouseCamClickedX - MouseHandler.MouseHandler_x; + camAngleDY = var5 * 2; + mouseCamClickedX = var5 != -1 && var5 != 1 ? (MouseHandler.MouseHandler_x + mouseCamClickedX) / 2 : MouseHandler.MouseHandler_x; } else { if (KeyHandler.KeyHandler_pressedKeys[96]) { camAngleDY += (-24 - camAngleDY) / 2; @@ -3708,178 +4012,72 @@ public final class Client extends GameShell implements Usernamed { } if (isCameraLocked) { - var3 = PendingSpawn.field925 * 128 + 64; - var4 = GrandExchangeOfferOwnWorldComparator.field639 * 128 + 64; - var5 = class195.getTileHeight(var3, var4, ClientPacket.Client_plane) - AbstractWorldMapIcon.field299; - if (class30.cameraX < var3) { - class30.cameraX = (var3 - class30.cameraX) * UserComparator3.field1990 / 1000 + class30.cameraX + GameObject.field1933; - if (class30.cameraX > var3) { - class30.cameraX = var3; - } - } - - if (class30.cameraX > var3) { - class30.cameraX -= UserComparator3.field1990 * (class30.cameraX - var3) / 1000 + GameObject.field1933; - if (class30.cameraX < var3) { - class30.cameraX = var3; - } - } - - if (GameObject.cameraY < var5) { - GameObject.cameraY = (var5 - GameObject.cameraY) * UserComparator3.field1990 / 1000 + GameObject.cameraY + GameObject.field1933; - if (GameObject.cameraY > var5) { - GameObject.cameraY = var5; - } - } - - if (GameObject.cameraY > var5) { - GameObject.cameraY -= UserComparator3.field1990 * (GameObject.cameraY - var5) / 1000 + GameObject.field1933; - if (GameObject.cameraY < var5) { - GameObject.cameraY = var5; - } - } - - if (FloorDecoration.cameraZ < var4) { - FloorDecoration.cameraZ = (var4 - FloorDecoration.cameraZ) * UserComparator3.field1990 / 1000 + FloorDecoration.cameraZ + GameObject.field1933; - if (FloorDecoration.cameraZ > var4) { - FloorDecoration.cameraZ = var4; - } - } - - if (FloorDecoration.cameraZ > var4) { - FloorDecoration.cameraZ -= UserComparator3.field1990 * (FloorDecoration.cameraZ - var4) / 1000 + GameObject.field1933; - if (FloorDecoration.cameraZ < var4) { - FloorDecoration.cameraZ = var4; - } - } - - var3 = class49.field417 * 128 + 64; - var4 = SecureRandomFuture.field1242 * 16384 + 64; - var5 = class195.getTileHeight(var3, var4, ClientPacket.Client_plane) - WorldMapCacheName.field308; - var6 = var3 - class30.cameraX; - var7 = var5 - GameObject.cameraY; - var8 = var4 - FloorDecoration.cameraZ; - var9 = (int)Math.sqrt((double)(var6 * var6 + var8 * var8)); - var10 = (int)(Math.atan2((double)var7, (double)var9) * 325.949D) & 2047; - var11 = (int)(Math.atan2((double)var6, (double)var8) * -325.949D) & 2047; - if (var10 < 128) { - var10 = 128; - } - - if (var10 > 383) { - var10 = 383; - } - - if (ItemContainer.cameraPitch < var10) { - ItemContainer.cameraPitch = (var10 - ItemContainer.cameraPitch) * BuddyRankComparator.field1998 / 1000 + ItemContainer.cameraPitch + FriendLoginUpdate.field3643; - if (ItemContainer.cameraPitch > var10) { - ItemContainer.cameraPitch = var10; - } - } - - if (ItemContainer.cameraPitch > var10) { - ItemContainer.cameraPitch -= BuddyRankComparator.field1998 * (ItemContainer.cameraPitch - var10) / 1000 + FriendLoginUpdate.field3643; - if (ItemContainer.cameraPitch < var10) { - ItemContainer.cameraPitch = var10; - } - } - - var12 = var11 - Decimator.cameraYaw; - if (var12 > 1024) { - var12 -= 2048; - } - - if (var12 < -1024) { - var12 += 2048; - } - - if (var12 > 0) { - Decimator.cameraYaw = Decimator.cameraYaw + FriendLoginUpdate.field3643 + var12 * BuddyRankComparator.field1998 / 1000; - Decimator.cameraYaw &= 2047; - } - - if (var12 < 0) { - Decimator.cameraYaw -= -var12 * BuddyRankComparator.field1998 / 1000 + FriendLoginUpdate.field3643; - Decimator.cameraYaw &= 2047; - } - - int var27 = var11 - Decimator.cameraYaw; - if (var27 > 1024) { - var27 -= 2048; - } - - if (var27 < -1024) { - var27 += 2048; - } - - if (var27 < 0 && var12 > 0 || var27 > 0 && var12 < 0) { - Decimator.cameraYaw = var11; - } + StructDefinition.method4529(); } - for (var3 = 0; var3 < 5; ++var3) { - int var10002 = field891[var3]++; + for (var4 = 0; var4 < 5; ++var4) { + int var10002 = field878[var4]++; } - AttackOption.varcs.tryWrite(); - var3 = ++MouseHandler.MouseHandler_idleCycles - 1; - var5 = KeyHandler.KeyHandler_idleCycles; - if (var3 > 15000 && var5 > 15000) { + MilliClock.varcs.tryWrite(); + var4 = ++MouseHandler.MouseHandler_idleCycles - 1; + var6 = MusicPatchNode.method3814(); + if (var4 > 15000 && var6 > 15000) { logoutTimer = 250; - class4.method56(14500); - var26 = ModelData0.getPacketBufferNode(ClientPacket.field2234, packetWriter.isaacCipher); + MouseHandler.MouseHandler_idleCycles = 14500; + var26 = class2.getPacketBufferNode(ClientPacket.field2268, packetWriter.isaacCipher); packetWriter.addNode(var26); } - VertexNormal.friendSystem.processFriendUpdates(); + Message.friendSystem.processFriendUpdates(); ++packetWriter.pendingWrites; if (packetWriter.pendingWrites > 50) { - var26 = ModelData0.getPacketBufferNode(ClientPacket.field2278, packetWriter.isaacCipher); + var26 = class2.getPacketBufferNode(ClientPacket.field2182, packetWriter.isaacCipher); packetWriter.addNode(var26); } try { packetWriter.flush(); - } catch (IOException var28) { - Projectile.method2137(); + } catch (IOException var29) { + StudioGame.method4119(); } return; } - var46 = var42.widget; - if (var46.childIndex < 0) { + var45 = var43.widget; + if (var45.childIndex < 0) { break; } - var41 = Language.getWidget(var46.parentId); - } while(var41 == null || var41.children == null || var46.childIndex >= var41.children.length || var46 != var41.children[var46.childIndex]); + var41 = Tile.getWidget(var45.parentId); + } while(var41 == null || var41.children == null || var45.childIndex >= var41.children.length || var45 != var41.children[var45.childIndex]); - WorldMapLabel.runScriptEvent(var42); + runScriptEvent(var43); } } - var46 = var42.widget; - if (var46.childIndex < 0) { + var45 = var43.widget; + if (var45.childIndex < 0) { break; } - var41 = Language.getWidget(var46.parentId); - } while(var41 == null || var41.children == null || var46.childIndex >= var41.children.length || var46 != var41.children[var46.childIndex]); + var41 = Tile.getWidget(var45.parentId); + } while(var41 == null || var41.children == null || var45.childIndex >= var41.children.length || var45 != var41.children[var45.childIndex]); - WorldMapLabel.runScriptEvent(var42); + runScriptEvent(var43); } } - var46 = var42.widget; - if (var46.childIndex < 0) { + var45 = var43.widget; + if (var45.childIndex < 0) { break; } - var41 = Language.getWidget(var46.parentId); - } while(var41 == null || var41.children == null || var46.childIndex >= var41.children.length || var46 != var41.children[var46.childIndex]); + var41 = Tile.getWidget(var45.parentId); + } while(var41 == null || var41.children == null || var45.childIndex >= var41.children.length || var45 != var41.children[var45.childIndex]); - WorldMapLabel.runScriptEvent(var42); + runScriptEvent(var43); } } } @@ -3887,15 +4085,15 @@ public final class Client extends GameShell implements Usernamed { } } - @ObfuscatedName("gd") + @ObfuscatedName("ge") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "184542015" + garbageValue = "1368439578" ) @Export("resizeJS") void resizeJS() { - int var1 = BoundaryObject.canvasWidth; - int var2 = WorldMapCacheName.canvasHeight; + int var1 = GrandExchangeOfferTotalQuantityComparator.canvasWidth; + int var2 = AttackOption.canvasHeight; if (super.contentWidth < var1) { var1 = super.contentWidth; } @@ -3904,53 +4102,58 @@ public final class Client extends GameShell implements Usernamed { var2 = super.contentHeight; } - if (UserComparator10.clientPreferences != null) { + if (Interpreter.clientPreferences != null) { try { - class47.method865(AbstractWorldMapIcon.client, "resize", new Object[]{class43.getWindowedMode()}); - } catch (Throwable var4) { + Client var3 = class206.client; + Object[] var4 = new Object[]{ItemDefinition.getWindowedMode()}; + JSObject.getWindow(var3).call("resize", var4); + } catch (Throwable var5) { } } } - @ObfuscatedName("gs") + @ObfuscatedName("gt") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1364255143" + garbageValue = "-1903314138" ) @Export("drawLoggedIn") final void drawLoggedIn() { + int var1; if (rootInterface != -1) { - class160.method3494(rootInterface); + var1 = rootInterface; + if (MusicPatch.loadInterface(var1)) { + MouseHandler.drawModelComponents(UserComparator7.Widget_interfaceComponents[var1], -1); + } } - int var1; for (var1 = 0; var1 < rootWidgetCount; ++var1) { - if (field847[var1]) { - field837[var1] = true; + if (field833[var1]) { + field834[var1] = true; } - field849[var1] = field847[var1]; - field847[var1] = false; + field835[var1] = field833[var1]; + field833[var1] = false; } - field690 = cycle; + field832 = cycle; viewportX = -1; viewportY = -1; - FloorOverlayDefinition.field3507 = null; + WorldMapManager.field312 = null; if (rootInterface != -1) { rootWidgetCount = 0; - class65.drawWidgets(rootInterface, 0, 0, BoundaryObject.canvasWidth, WorldMapCacheName.canvasHeight, 0, 0, -1); + class13.drawWidgets(rootInterface, 0, 0, GrandExchangeOfferTotalQuantityComparator.canvasWidth, AttackOption.canvasHeight, 0, 0, -1); } Rasterizer2D.Rasterizer2D_resetClip(); if (showMouseCross) { if (mouseCrossColor == 1) { - KeyHandler.crossSprites[mouseCrossState * 400 / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); + ObjectDefinition.crossSprites[mouseCrossState * 20 / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); } if (mouseCrossColor == 2) { - KeyHandler.crossSprites[mouseCrossState * 400 / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); + ObjectDefinition.crossSprites[mouseCrossState * 20 / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); } } @@ -3965,42 +4168,42 @@ public final class Client extends GameShell implements Usernamed { var1 = viewportX; var2 = viewportY; if ((menuOptionsCount >= 2 || isItemSelected != 0 || isSpellSelected) && showMouseOverText) { - var3 = menuOptionsCount - 1; - String var5; + var3 = GrandExchangeOfferOwnWorldComparator.method1288(); + String var19; if (isItemSelected == 1 && menuOptionsCount < 2) { - var5 = "Use" + " " + selectedItemName + " " + "->"; + var19 = "Use" + " " + selectedItemName + " " + "->"; } else if (isSpellSelected && menuOptionsCount < 2) { - var5 = selectedSpellActionName + " " + selectedSpellName + " " + "->"; + var19 = selectedSpellActionName + " " + selectedSpellName + " " + "->"; } else { - String var16; + String var5; if (var3 < 0) { - var16 = ""; + var5 = ""; } else if (menuTargets[var3].length() > 0) { - var16 = menuActions[var3] + " " + menuTargets[var3]; + var5 = menuActions[var3] + " " + menuTargets[var3]; } else { - var16 = menuActions[var3]; + var5 = menuActions[var3]; } - var5 = var16; + var19 = var5; } if (menuOptionsCount > 2) { - var5 = var5 + class222.colorStartTag(16777215) + " " + '/' + " " + (menuOptionsCount - 2) + " more options"; + var19 = var19 + NPC.colorStartTag(16777215) + " " + '/' + " " + (menuOptionsCount - 2) + " more options"; } - JagexCache.fontBold12.drawRandomAlphaAndSpacing(var5, var1 + 4, var2 + 15, 16777215, 0, cycle / 1000); + GrandExchangeOffer.fontBold12.drawRandomAlphaAndSpacing(var19, var1 + 4, var2 + 15, 16777215, 0, cycle / 1000); } } } else { - var1 = HealthBar.menuX; - var2 = class191.menuY; - var3 = TileItemPile.menuWidth; - var4 = SoundSystem.menuHeight; + var1 = GrandExchangeEvent.menuX; + var2 = WorldMapManager.menuY; + var3 = KeyHandler.menuWidth; + var4 = class54.menuHeight; int var13 = 6116423; Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, var13); Rasterizer2D.Rasterizer2D_fillRectangle(var1 + 1, var2 + 1, var3 - 2, 16, 0); Rasterizer2D.Rasterizer2D_drawRectangle(var1 + 1, var2 + 18, var3 - 2, var4 - 19, 0); - JagexCache.fontBold12.draw("Choose Option", var1 + 3, var2 + 14, var13, -1); + GrandExchangeOffer.fontBold12.draw("Choose Option", var1 + 3, var2 + 14, var13, -1); var6 = MouseHandler.MouseHandler_x; var7 = MouseHandler.MouseHandler_y; @@ -4009,11 +4212,11 @@ public final class Client extends GameShell implements Usernamed { for (var8 = 0; var8 < menuOptionsCount; ++var8) { var9 = (menuOptionsCount - 1 - var8) * 15 + var2 + 31; var10 = 16777215; - if (var6 > var1 && var6 < var3 + var1 && var7 > var9 - 13 && var7 < var9 + 3) { + if (var6 > var1 && var6 < var1 + var3 && var7 > var9 - 13 && var7 < var9 + 3) { var10 = 16776960; } - Font var11 = JagexCache.fontBold12; + Font var11 = GrandExchangeOffer.fontBold12; String var12; if (var8 < 0) { var12 = ""; @@ -4026,147 +4229,147 @@ public final class Client extends GameShell implements Usernamed { var11.draw(var12, var1 + 3, var9, var10, 0); } - var8 = HealthBar.menuX; - var9 = class191.menuY; - var10 = TileItemPile.menuWidth; - int var14 = SoundSystem.menuHeight; + var8 = GrandExchangeEvent.menuX; + var9 = WorldMapManager.menuY; + var10 = KeyHandler.menuWidth; + int var14 = class54.menuHeight; for (int var15 = 0; var15 < rootWidgetCount; ++var15) { - if (rootWidgetXs[var15] + rootWidgetWidths[var15] > var8 && rootWidgetXs[var15] < var10 + var8 && rootWidgetYs[var15] + rootWidgetHeights[var15] > var9 && rootWidgetYs[var15] < var14 + var9) { - field837[var15] = true; + if (rootWidgetWidths[var15] + rootWidgetXs[var15] > var8 && rootWidgetXs[var15] < var10 + var8 && rootWidgetHeights[var15] + rootWidgetYs[var15] > var9 && rootWidgetYs[var15] < var9 + var14) { + field834[var15] = true; } } } if (gameDrawingMode == 3) { for (var1 = 0; var1 < rootWidgetCount; ++var1) { - if (field849[var1]) { + if (field835[var1]) { Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); - } else if (field837[var1]) { + } else if (field834[var1]) { Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); } } } - var1 = ClientPacket.Client_plane; - var2 = class215.localPlayer.x; - var3 = class215.localPlayer.y; - var4 = field704; + var1 = UrlRequest.Client_plane; + var2 = Message.localPlayer.x; + var3 = Message.localPlayer.y; + var4 = field690; for (ObjectSound var20 = (ObjectSound)ObjectSound.objectSounds.last(); var20 != null; var20 = (ObjectSound)ObjectSound.objectSounds.previous()) { if (var20.soundEffectId != -1 || var20.soundEffectIds != null) { var6 = 0; - if (var2 > var20.field1074 * 16384) { - var6 += var2 - var20.field1074 * 16384; - } else if (var2 < var20.x * 16384) { - var6 += var20.x * 16384 - var2; + if (var2 > var20.field1064 * 16384) { + var6 += var2 - var20.field1064 * 16384; + } else if (var2 < var20.x * 128) { + var6 += var20.x * 128 - var2; } - if (var3 > var20.field1071 * 16384) { - var6 += var3 - var20.field1071 * 16384; + if (var3 > var20.field1052 * 16384) { + var6 += var3 - var20.field1052 * 16384; } else if (var3 < var20.y * 16384) { var6 += var20.y * 16384 - var3; } - if (var6 - 64 <= var20.field1072 && areaSoundEffectVolume != 0 && var1 == var20.plane) { + if (var6 - 64 <= var20.field1053 && areaSoundEffectVolume != 0 && var1 == var20.plane) { var6 -= 64; if (var6 < 0) { var6 = 0; } - var7 = (var20.field1072 - var6) * areaSoundEffectVolume / var20.field1072; + var7 = (var20.field1053 - var6) * areaSoundEffectVolume / var20.field1053; Object var10000; if (var20.stream1 == null) { if (var20.soundEffectId >= 0) { var10000 = null; - SoundEffect var17 = SoundEffect.readSoundEffect(SpriteMask.archive4, var20.soundEffectId, 0); - if (var17 != null) { - RawSound var18 = var17.toRawSound().resample(LoginScreenAnimation.decimator); - RawPcmStream var19 = RawPcmStream.createRawPcmStream(var18, 100, var7); - var19.setNumLoops(-1); - ClientPacket.pcmStreamMixer.addSubStream(var19); - var20.stream1 = var19; + SoundEffect var16 = SoundEffect.readSoundEffect(FloorDecoration.archive4, var20.soundEffectId, 0); + if (var16 != null) { + RawSound var17 = var16.toRawSound().resample(ClientPreferences.decimator); + RawPcmStream var18 = RawPcmStream.createRawPcmStream(var17, 100, var7); + var18.setNumLoops(-1); + Tiles.pcmStreamMixer.addSubStream(var18); + var20.stream1 = var18; } } } else { - var20.stream1.method2572(var7); + var20.stream1.method2578(var7); } if (var20.stream2 == null) { - if (var20.soundEffectIds != null && (var20.field1078 -= var4) <= 0) { + if (var20.soundEffectIds != null && (var20.field1055 -= var4) <= 0) { var8 = (int)(Math.random() * (double)var20.soundEffectIds.length); var10000 = null; - SoundEffect var22 = SoundEffect.readSoundEffect(SpriteMask.archive4, var20.soundEffectIds[var8], 0); + SoundEffect var22 = SoundEffect.readSoundEffect(FloorDecoration.archive4, var20.soundEffectIds[var8], 0); if (var22 != null) { - RawSound var23 = var22.toRawSound().resample(LoginScreenAnimation.decimator); + RawSound var23 = var22.toRawSound().resample(ClientPreferences.decimator); RawPcmStream var21 = RawPcmStream.createRawPcmStream(var23, 100, var7); var21.setNumLoops(0); - ClientPacket.pcmStreamMixer.addSubStream(var21); + Tiles.pcmStreamMixer.addSubStream(var21); var20.stream2 = var21; - var20.field1078 = var20.field1075 + (int)(Math.random() * (double)(var20.field1076 - var20.field1075)); + var20.field1055 = var20.field1060 + (int)(Math.random() * (double)(var20.field1061 - var20.field1060)); } } } else { - var20.stream2.method2572(var7); + var20.stream2.method2578(var7); if (!var20.stream2.hasNext()) { var20.stream2 = null; } } } else { if (var20.stream1 != null) { - ClientPacket.pcmStreamMixer.removeSubStream(var20.stream1); + Tiles.pcmStreamMixer.removeSubStream(var20.stream1); var20.stream1 = null; } if (var20.stream2 != null) { - ClientPacket.pcmStreamMixer.removeSubStream(var20.stream2); + Tiles.pcmStreamMixer.removeSubStream(var20.stream2); var20.stream2 = null; } } } } - field704 = 0; + field690 = 0; } @ObfuscatedName("hc") @ObfuscatedSignature( - signature = "(Lcc;I)Z", - garbageValue = "2024286178" + signature = "(Lcr;I)Z", + garbageValue = "1049525241" ) - final boolean method1316(PacketWriter var1) { + final boolean method1304(PacketWriter var1) { AbstractSocket var2 = var1.getSocket(); PacketBuffer var3 = var1.packetBuffer; if (var2 == null) { return false; } else { int var6; - String var19; + String var18; try { int var5; if (var1.serverPacket == null) { - if (var1.field1307) { + if (var1.field1297) { if (!var2.isAvailable(1)) { return false; } var2.read(var1.packetBuffer.array, 0, 1); - var1.field1305 = 0; - var1.field1307 = false; + var1.field1298 = 0; + var1.field1297 = false; } var3.offset = 0; - if (var3.method5581()) { + if (var3.method5492()) { if (!var2.isAvailable(1)) { return false; } var2.read(var1.packetBuffer.array, 1, 1); - var1.field1305 = 0; + var1.field1298 = 0; } - var1.field1307 = true; - ServerPacket[] var4 = WorldMapLabelSize.ServerPacket_values(); + var1.field1297 = true; + ServerPacket[] var4 = class162.ServerPacket_values(); var5 = var3.readSmartByteShortIsaac(); if (var5 < 0 || var5 >= var4.length) { throw new IOException(var5 + " " + var3.offset); @@ -4201,314 +4404,114 @@ public final class Client extends GameShell implements Usernamed { var3.offset = 0; var2.read(var3.array, 0, var1.serverPacketLength); - var1.field1305 = 0; - timer.method5071(); - var1.field1312 = var1.field1311; - var1.field1311 = var1.field1299; - var1.field1299 = var1.serverPacket; - if (ServerPacket.field2211 == var1.serverPacket) { - HealthBarUpdate.method1779(class185.field2331); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2197 == var1.serverPacket) { - HealthBarUpdate.method1779(class185.field2337); - var1.serverPacket = null; - return true; - } - + var1.field1298 = 0; + timer.method5016(); + var1.field1299 = var1.field1301; + var1.field1301 = var1.field1300; + var1.field1300 = var1.serverPacket; int var16; - if (ServerPacket.field2176 == var1.serverPacket) { - var16 = var3.readUnsignedShort(); - var5 = var3.readInt(); + if (ServerPacket.field2100 == var1.serverPacket) { + var16 = var3.method5583(); + var5 = var3.method5591(); Varps.Varps_temp[var16] = var5; if (Varps.Varps_main[var16] != var5) { Varps.Varps_main[var16] = var5; } - ObjectDefinition.changeGameOptions(var16); - field828[++field829 - 1 & 31] = var16; + BufferedSink.changeGameOptions(var16); + field814[++field648 - 1 & 31] = var16; var1.serverPacket = null; return true; } - InterfaceParent var43; - if (ServerPacket.field2168 == var1.serverPacket) { - var16 = var3.readUnsignedShort(); - var5 = var3.readUnsignedByte(); - var6 = var3.method5649(); - var43 = (InterfaceParent)interfaceParents.get((long)var6); - if (var43 != null) { - class43.closeInterface(var43, var16 != var43.group); + if (ServerPacket.field2107 == var1.serverPacket) { + var16 = var3.method5583(); + if (var16 == 65535) { + var16 = -1; } - Friend.method5303(var6, var16, var5); + WorldMapSprite.playSong(var16); var1.serverPacket = null; return true; } - if (ServerPacket.field2146 == var1.serverPacket) { - UrlRequest.updatePlayers(var3, var1.serverPacketLength); - ChatChannel.method2274(); + if (ServerPacket.field2148 == var1.serverPacket) { + var16 = var3.method5723(); + if (var16 == 65535) { + var16 = -1; + } + + var5 = var3.readMedium(); + ScriptFrame.playSoundJingle(var16, var5); var1.serverPacket = null; return true; } - int var8; - int var9; - Widget var17; - int var18; - if (ServerPacket.field2203 == var1.serverPacket) { + if (ServerPacket.field2157 == var1.serverPacket) { var16 = var3.readInt(); - var5 = var3.readUnsignedShort(); - if (var16 < -70000) { - var5 += 32768; - } - - if (var16 >= 0) { - var17 = Language.getWidget(var16); - } else { - var17 = null; - } - - for (; var3.offset < var1.serverPacketLength; WorldMapDecorationType.itemContainerSetItem(var5, var18, var8 - 1, var9)) { - var18 = var3.readUShortSmart(); - var8 = var3.readUnsignedShort(); - var9 = 0; - if (var8 != 0) { - var9 = var3.readUnsignedByte(); - if (var9 == 255) { - var9 = var3.readInt(); - } - } - - if (var17 != null && var18 >= 0 && var18 < var17.itemIds.length) { - var17.itemIds[var18] = var8; - var17.itemQuantities[var18] = var9; - } - } - - if (var17 != null) { - ScriptEvent.invalidateWidget(var17); - } - - class312.method6006(); - changedItemContainers[++field898 - 1 & 31] = var5 & 32767; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2155 == var1.serverPacket) { - WorldMapRegion.loadRegions(false, var1.packetBuffer); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2145 == var1.serverPacket) { - destinationX = var3.readUnsignedByte(); - if (destinationX == 255) { - destinationX = 0; - } - - destinationY = var3.readUnsignedByte(); - if (destinationY == 255) { - destinationY = 0; + if (var16 != field710) { + field710 = var16; + KeyHandler.method835(); } var1.serverPacket = null; return true; } - if (ServerPacket.field2164 == var1.serverPacket) { - var3.offset += 28; - if (var3.checkCrc()) { - class32.method570(var3, var3.offset - 28); - } - + if (ServerPacket.field2147 == var1.serverPacket) { + InterfaceParent.logOut(); var1.serverPacket = null; - return true; + return false; } - if (ServerPacket.field2185 == var1.serverPacket) { - class312.method6006(); - var16 = var3.method5689(); + if (ServerPacket.field2104 == var1.serverPacket) { + var16 = var3.readInt(); var5 = var3.readInt(); - var6 = var3.method5631(); - experience[var16] = var5; - currentLevels[var16] = var6; - levels[var16] = 1; - - for (var18 = 0; var18 < 98; ++var18) { - if (var5 >= Skills.Skills_experienceTable[var18]) { - levels[var16] = var18 + 2; - } - } - - changedSkills[++changedSkillsCount - 1 & 31] = var16; + var6 = WorldMapSectionType.getGcDuration(); + PacketBufferNode var42 = class2.getPacketBufferNode(ClientPacket.field2191, packetWriter.isaacCipher); + var42.packetBuffer.method5569(GameShell.fps); + var42.packetBuffer.writeShortLE(var16); + var42.packetBuffer.writeShortLE(var5); + var42.packetBuffer.method5696(var6); + packetWriter.addNode(var42); var1.serverPacket = null; return true; } - if (ServerPacket.field2149 == var1.serverPacket) { - if (rootInterface != -1) { - GrandExchangeEvents.runIntfCloseListeners(rootInterface, 0); + Widget var17; + if (ServerPacket.field2163 == var1.serverPacket) { + var16 = var3.method5583(); + var5 = var3.method5590(); + var17 = Tile.getWidget(var5); + if (var17.modelType != 1 || var16 != var17.modelId) { + var17.modelType = 1; + var17.modelId = var16; + LoginPacket.invalidateWidget(var17); } var1.serverPacket = null; return true; } - if (ServerPacket.field2132 == var1.serverPacket) { - var16 = var3.readUnsignedByte(); - class192.method3732(var16); + if (ServerPacket.field2088 == var1.serverPacket) { + minimapState = var3.readUnsignedByte(); var1.serverPacket = null; return true; } - if (ServerPacket.field2140 == var1.serverPacket) { - var16 = var3.method5588(); - var19 = var3.readStringCp1252NullTerminated(); - var17 = Language.getWidget(var16); - if (!var19.equals(var17.text)) { - var17.text = var19; - ScriptEvent.invalidateWidget(var17); - } - + if (ServerPacket.field2142 == var1.serverPacket) { + AbstractWorldMapIcon.method614(class179.field2297); var1.serverPacket = null; return true; } - if (ServerPacket.field2183 == var1.serverPacket) { - class40.field343 = var3.method5631(); - class227.field3092 = var3.method5631(); + if (ServerPacket.field2120 == var1.serverPacket) { + WorldMapRectangle.updateNpcs(true, var3); var1.serverPacket = null; return true; } - if (ServerPacket.field2133 == var1.serverPacket) { - var16 = var3.method5728(); - var19 = var3.readStringCp1252NullTerminated(); - var6 = var3.method5689(); - if (var6 >= 1 && var6 <= 8) { - if (var19.equalsIgnoreCase("null")) { - var19 = null; - } - - playerMenuActions[var6 - 1] = var19; - playerOptionsPriorities[var6 - 1] = var16 == 0; - } - - var1.serverPacket = null; - return true; - } - - Widget var52; - if (ServerPacket.field2137 == var1.serverPacket) { - var16 = var3.readInt(); - var5 = var3.method5588(); - InterfaceParent var56 = (InterfaceParent)interfaceParents.get((long)var16); - var43 = (InterfaceParent)interfaceParents.get((long)var5); - if (var43 != null) { - class43.closeInterface(var43, var56 == null || var56.group != var43.group); - } - - if (var56 != null) { - var56.remove(); - interfaceParents.put(var56, (long)var5); - } - - var52 = Language.getWidget(var16); - if (var52 != null) { - ScriptEvent.invalidateWidget(var52); - } - - var52 = Language.getWidget(var5); - if (var52 != null) { - ScriptEvent.invalidateWidget(var52); - MilliClock.revalidateWidgetScroll(FloorDecoration.Widget_interfaceComponents[var52.id >>> 16], var52, true); - } - - if (rootInterface != -1) { - GrandExchangeEvents.runIntfCloseListeners(rootInterface, 1); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2207 == 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]; - ObjectDefinition.changeGameOptions(var16); - field828[++field829 - 1 & 31] = var16; - } - } - - var1.serverPacket = null; - return true; - } - - long var21; - long var23; - String var39; - if (ServerPacket.field2130 == var1.serverPacket) { - var39 = var3.readStringCp1252NullTerminated(); - var21 = (long)var3.readUnsignedShort(); - var23 = (long)var3.readMedium(); - PlayerType var25 = (PlayerType)CollisionMap.findEnumerated(class2.PlayerType_values(), var3.readUnsignedByte()); - long var10 = (var21 << 32) + var23; - boolean var12 = false; - - for (int var13 = 0; var13 < 100; ++var13) { - if (var10 == field861[var13]) { - var12 = true; - break; - } - } - - if (VertexNormal.friendSystem.isIgnored(new Username(var39, WorldMapLabelSize.loginType))) { - var12 = true; - } - - if (!var12 && field756 == 0) { - field861[field855] = var10; - field855 = (field855 + 1) % 100; - String var26 = AbstractFont.escapeBrackets(class191.method3720(GrandExchangeOfferUnitPriceComparator.method142(var3))); - byte var46; - if (var25.isPrivileged) { - var46 = 7; - } else { - var46 = 3; - } - - if (var25.modIcon != -1) { - GrandExchangeOfferAgeComparator.addGameMessage(var46, method1749(var25.modIcon) + var39, var26); - } else { - GrandExchangeOfferAgeComparator.addGameMessage(var46, var39, var26); - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2194 == var1.serverPacket) { - var16 = var3.readInt(); - var5 = var3.method5719(); - var17 = Language.getWidget(var16); - if (var17.modelType != 2 || var5 != var17.modelId) { - var17.modelType = 2; - var17.modelId = var5; - ScriptEvent.invalidateWidget(var17); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2199 == var1.serverPacket) { + if (ServerPacket.field2114 == var1.serverPacket) { for (var16 = 0; var16 < players.length; ++var16) { if (players[var16] != null) { players[var16].sequence = -1; @@ -4525,10 +4528,62 @@ public final class Client extends GameShell implements Usernamed { return true; } - if (ServerPacket.field2128 == var1.serverPacket) { - var16 = var3.readUnsignedShort(); - var5 = var3.readInt(); - var17 = Language.getWidget(var5); + Widget var55; + if (ServerPacket.field2112 == var1.serverPacket) { + var16 = var3.method5592(); + var55 = Tile.getWidget(var16); + + for (var6 = 0; var6 < var55.itemIds.length; ++var6) { + var55.itemIds[var6] = -1; + var55.itemIds[var6] = 0; + } + + LoginPacket.invalidateWidget(var55); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2160 == var1.serverPacket) { + var16 = var3.readInt(); + var5 = var3.method5565(); + var17 = Tile.getWidget(var16); + if (var5 != var17.sequenceId || var5 == -1) { + var17.sequenceId = var5; + var17.modelFrame = 0; + var17.modelFrameCycle = 0; + LoginPacket.invalidateWidget(var17); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2164 == var1.serverPacket) { + AbstractWorldMapIcon.method614(class179.field2298); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2159 == var1.serverPacket) { + Message.friendSystem.ignoreList.read(var3, var1.serverPacketLength); + GameShell.FriendSystem_invalidateIgnoreds(); + field711 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2113 == var1.serverPacket) { + Buddy.method5211(); + runEnergy = var3.readUnsignedByte(); + field825 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2152 == var1.serverPacket) { + var16 = var3.method5583(); + var5 = var3.method5590(); + var17 = Tile.getWidget(var5); if (var17 != null && var17.type == 0) { if (var16 > var17.scrollHeight - var17.height) { var16 = var17.scrollHeight - var17.height; @@ -4540,7 +4595,7 @@ public final class Client extends GameShell implements Usernamed { if (var16 != var17.scrollY) { var17.scrollY = var16; - ScriptEvent.invalidateWidget(var17); + LoginPacket.invalidateWidget(var17); } } @@ -4548,200 +4603,83 @@ public final class Client extends GameShell implements Usernamed { return true; } - if (ServerPacket.field2182 == var1.serverPacket) { - VertexNormal.friendSystem.readUpdate(var3, var1.serverPacketLength); - field833 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2181 == var1.serverPacket) { - HealthBarUpdate.method1779(class185.field2333); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2212 == var1.serverPacket) { - var16 = var3.readUnsignedByte(); - var5 = var3.readUnsignedByte(); - var6 = var3.readUnsignedByte(); - var18 = var3.readUnsignedByte(); - field835[var16] = true; - field736[var16] = var5; - field901[var16] = var6; - field890[var16] = var18; - field891[var16] = 0; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2141 == var1.serverPacket) { - isCameraLocked = true; - PendingSpawn.field925 = var3.readUnsignedByte() * 16384; - GrandExchangeOfferOwnWorldComparator.field639 = var3.readUnsignedByte() * 16384; - AbstractWorldMapIcon.field299 = var3.readUnsignedShort(); - GameObject.field1933 = var3.readUnsignedByte(); - UserComparator3.field1990 = var3.readUnsignedByte(); - if (UserComparator3.field1990 >= 100) { - class30.cameraX = PendingSpawn.field925 * 128 + 64; - FloorDecoration.cameraZ = GrandExchangeOfferOwnWorldComparator.field639 * 128 + 64; - GameObject.cameraY = class195.getTileHeight(class30.cameraX, FloorDecoration.cameraZ, ClientPacket.Client_plane) - AbstractWorldMapIcon.field299; + if (ServerPacket.field2110 == var1.serverPacket) { + for (var16 = 0; var16 < Varps.Varps_main.length; ++var16) { + if (Varps.Varps_main[var16] != Varps.Varps_temp[var16]) { + Varps.Varps_main[var16] = Varps.Varps_temp[var16]; + BufferedSink.changeGameOptions(var16); + field814[++field648 - 1 & 31] = var16; + } } var1.serverPacket = null; return true; } + if (ServerPacket.field2140 == var1.serverPacket) { + Message.friendSystem.method1845(); + field711 = cycleCntr; + var1.serverPacket = null; + return true; + } + + int var8; + int var9; + long var12; + int var19; + int var20; + InterfaceParent var41; if (ServerPacket.field2153 == var1.serverPacket) { - var39 = var3.readStringCp1252NullTerminated(); - Object[] var59 = new Object[var39.length() + 1]; + var16 = var3.offset + var1.serverPacketLength; + var5 = var3.readUnsignedShort(); + var6 = var3.readUnsignedShort(); + if (var5 != rootInterface) { + rootInterface = var5; + this.resizeRoot(false); + GameShell.Widget_resetModelFrames(rootInterface); + Players.runWidgetOnLoadListener(rootInterface); - for (var6 = var39.length() - 1; var6 >= 0; --var6) { - if (var39.charAt(var6) == 's') { - var59[var6 + 1] = var3.readStringCp1252NullTerminated(); + for (var19 = 0; var19 < 100; ++var19) { + field833[var19] = true; + } + } + + InterfaceParent var43; + for (; var6-- > 0; var43.field546 = true) { + var19 = var3.readInt(); + var8 = var3.readUnsignedShort(); + var9 = var3.readUnsignedByte(); + var43 = (InterfaceParent)interfaceParents.get((long)var19); + if (var43 != null && var8 != var43.group) { + VarpDefinition.closeInterface(var43, true); + var43 = null; + } + + if (var43 == null) { + var43 = ScriptFrame.method1107(var19, var8, var9); + } + } + + for (var41 = (InterfaceParent)interfaceParents.first(); var41 != null; var41 = (InterfaceParent)interfaceParents.next()) { + if (var41.field546) { + var41.field546 = false; } else { - var59[var6 + 1] = new Integer(var3.readInt()); + VarpDefinition.closeInterface(var41, true); } } - var59[0] = new Integer(var3.readInt()); - ScriptEvent var51 = new ScriptEvent(); - var51.args = var59; - WorldMapLabel.runScriptEvent(var51); - var1.serverPacket = null; - return true; - } + widgetClickMasks = new NodeHashTable(512); - long var27; - if (ServerPacket.field2136 == var1.serverPacket) { - var16 = var3.method5641(); - if (var16 == 65535) { - var16 = -1; - } + while (var3.offset < var16) { + var19 = var3.readInt(); + var8 = var3.readUnsignedShort(); + var9 = var3.readUnsignedShort(); + var20 = var3.readInt(); - var5 = var3.readInt(); - var6 = var3.method5650(); - var18 = var3.method5641(); - if (var18 == 65535) { - var18 = -1; - } - - for (var8 = var18; var8 <= var16; ++var8) { - var27 = ((long)var6 << 32) + (long)var8; - Node var44 = widgetClickMasks.get(var27); - if (var44 != null) { - var44.remove(); + for (int var11 = var8; var11 <= var9; ++var11) { + var12 = (long)var11 + ((long)var19 << 32); + widgetClickMasks.put(new IntegerNode(var20), var12); } - - widgetClickMasks.put(new IntegerNode(var5), var27); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2169 == var1.serverPacket) { - var16 = var3.readUnsignedByte(); - DevicePcmPlayerProvider.forceDisconnect(var16); - var1.serverPacket = null; - return false; - } - - long var29; - if (ServerPacket.field2188 == var1.serverPacket) { - var39 = var3.readStringCp1252NullTerminated(); - var21 = var3.readLong(); - var23 = (long)var3.readUnsignedShort(); - var27 = (long)var3.readMedium(); - PlayerType var11 = (PlayerType)CollisionMap.findEnumerated(class2.PlayerType_values(), var3.readUnsignedByte()); - var29 = var27 + (var23 << 32); - boolean var14 = false; - - for (int var15 = 0; var15 < 100; ++var15) { - if (var29 == field861[var15]) { - var14 = true; - break; - } - } - - if (var11.isUser && VertexNormal.friendSystem.isIgnored(new Username(var39, WorldMapLabelSize.loginType))) { - var14 = true; - } - - if (!var14 && field756 == 0) { - field861[field855] = var29; - field855 = (field855 + 1) % 100; - String var31 = AbstractFont.escapeBrackets(class191.method3720(GrandExchangeOfferUnitPriceComparator.method142(var3))); - if (var11.modIcon != -1) { - SecureRandomCallable.addChatMessage(9, method1749(var11.modIcon) + var39, var31, GrandExchangeOffer.base37DecodeLong(var21)); - } else { - SecureRandomCallable.addChatMessage(9, var39, var31, GrandExchangeOffer.base37DecodeLong(var21)); - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2190 == var1.serverPacket) { - var16 = var3.method5650(); - var5 = var3.method5643(); - var17 = Language.getWidget(var16); - if (var5 != var17.sequenceId || var5 == -1) { - var17.sequenceId = var5; - var17.modelFrame = 0; - var17.modelFrameCycle = 0; - ScriptEvent.invalidateWidget(var17); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2150 == var1.serverPacket) { - var16 = var3.method5640(); - byte var45 = var3.method5637(); - Varps.Varps_temp[var16] = var45; - if (Varps.Varps_main[var16] != var45) { - Varps.Varps_main[var16] = var45; - } - - ObjectDefinition.changeGameOptions(var16); - field828[++field829 - 1 & 31] = var16; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2205 == var1.serverPacket) { - VertexNormal.friendSystem.method1867(); - field833 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2201 == var1.serverPacket) { - var16 = var3.method5719(); - var5 = var3.method5588(); - var17 = Language.getWidget(var5); - if (var17.modelType != 1 || var16 != var17.modelId) { - var17.modelType = 1; - var17.modelId = var16; - ScriptEvent.invalidateWidget(var17); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2174 == var1.serverPacket) { - var16 = var3.readUnsignedShort(); - rootInterface = var16; - this.resizeRoot(false); - WorldMapArea.Widget_resetModelFrames(var16); - UserComparator9.runWidgetOnLoadListener(rootInterface); - - for (var5 = 0; var5 < 100; ++var5) { - field847[var5] = true; } var1.serverPacket = null; @@ -4749,197 +4687,193 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field2154 == var1.serverPacket) { - class312.method6006(); - weight = var3.readShort(); - field834 = cycleCntr; - var1.serverPacket = null; - return true; - } + Buddy.method5211(); + var16 = var3.method5628(); + var5 = var3.method5628(); + var6 = var3.method5591(); + experience[var5] = var6; + currentLevels[var5] = var16; + levels[var5] = 1; - if (ServerPacket.field2134 == var1.serverPacket) { - class312.method6006(); - runEnergy = var3.readUnsignedByte(); - field834 = cycleCntr; - var1.serverPacket = null; - return true; - } - - int var33; - if (ServerPacket.field2186 == var1.serverPacket) { - var16 = var3.offset + var1.serverPacketLength; - var5 = var3.readUnsignedShort(); - var6 = var3.readUnsignedShort(); - if (var5 != rootInterface) { - rootInterface = var5; - this.resizeRoot(false); - WorldMapArea.Widget_resetModelFrames(rootInterface); - UserComparator9.runWidgetOnLoadListener(rootInterface); - - for (var18 = 0; var18 < 100; ++var18) { - field847[var18] = true; - } - } - - InterfaceParent var60; - for (; var6-- > 0; var60.field561 = true) { - var18 = var3.readInt(); - var8 = var3.readUnsignedShort(); - var9 = var3.readUnsignedByte(); - var60 = (InterfaceParent)interfaceParents.get((long)var18); - if (var60 != null && var8 != var60.group) { - class43.closeInterface(var60, true); - var60 = null; - } - - if (var60 == null) { - var60 = Friend.method5303(var18, var8, var9); - } - } - - for (var43 = (InterfaceParent)interfaceParents.first(); var43 != null; var43 = (InterfaceParent)interfaceParents.next()) { - if (var43.field561) { - var43.field561 = false; - } else { - class43.closeInterface(var43, true); - } - } - - widgetClickMasks = new NodeHashTable(512); - - while (var3.offset < var16) { - var18 = var3.readInt(); - var8 = var3.readUnsignedShort(); - var9 = var3.readUnsignedShort(); - var33 = var3.readInt(); - - for (int var34 = var8; var34 <= var9; ++var34) { - var29 = (long)var34 + ((long)var18 << 32); - widgetClickMasks.put(new IntegerNode(var33), var29); + for (var19 = 0; var19 < 98; ++var19) { + if (var6 >= Skills.Skills_experienceTable[var19]) { + levels[var5] = var19 + 2; } } + changedSkills[++changedSkillsCount - 1 & 31] = var5; var1.serverPacket = null; return true; } - if (ServerPacket.field2175 == var1.serverPacket) { - isCameraLocked = false; - - for (var16 = 0; var16 < 5; ++var16) { - field835[var16] = false; - } - + if (ServerPacket.field2095 == var1.serverPacket) { + AbstractWorldMapIcon.method614(class179.field2289); var1.serverPacket = null; return true; } - if (ServerPacket.field2167 == var1.serverPacket) { - HealthBarUpdate.method1779(class185.field2340); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2156 == var1.serverPacket) { - class227.field3092 = var3.method5631(); - class40.field343 = var3.method5689(); - - while (var3.offset < var1.serverPacketLength) { - var16 = var3.readUnsignedByte(); - class185 var58 = FriendSystem.method1927()[var16]; - HealthBarUpdate.method1779(var58); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2210 == var1.serverPacket) { - var16 = var3.readInt(); - InterfaceParent var57 = (InterfaceParent)interfaceParents.get((long)var16); - if (var57 != null) { - class43.closeInterface(var57, true); - } - - if (meslayerContinueWidget != null) { - ScriptEvent.invalidateWidget(meslayerContinueWidget); - meslayerContinueWidget = null; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2166 == var1.serverPacket) { - HealthBarUpdate.method1779(class185.field2332); + if (ServerPacket.field2122 == var1.serverPacket) { + AbstractWorldMapIcon.method614(class179.field2290); var1.serverPacket = null; return true; } Widget var7; - if (ServerPacket.field2163 == var1.serverPacket) { + if (ServerPacket.field2128 == var1.serverPacket) { + var16 = var3.method5723(); + var5 = var3.method5723(); + var6 = var3.readInt(); + var7 = Tile.getWidget(var6); + var7.field2607 = var16 + (var5 << 16); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2134 == var1.serverPacket) { var16 = var3.readUnsignedShort(); - var5 = var3.method5650(); - var6 = var3.method5719(); - var7 = Language.getWidget(var5); - var7.field2633 = var6 + (var16 << 16); + var5 = var3.readUnsignedByte(); + var6 = var3.readUnsignedShort(); + class268.queueSoundEffect(var16, var5, var6); var1.serverPacket = null; return true; } - if (ServerPacket.field2195 == var1.serverPacket) { - var16 = var3.readInt(); - var5 = var3.method5641(); - if (var5 == 65535) { - var5 = -1; + if (ServerPacket.field2138 == var1.serverPacket) { + isCameraLocked = false; + + for (var16 = 0; var16 < 5; ++var16) { + field779[var16] = false; } - var6 = var3.method5650(); - var7 = Language.getWidget(var16); - ItemDefinition var54; - if (!var7.isIf3) { - if (var5 == -1) { - var7.modelType = 0; - var1.serverPacket = null; - return true; - } + var1.serverPacket = null; + return true; + } - var54 = Interpreter.ItemDefinition_get(var5); - var7.modelType = 4; - var7.modelId = var5; - var7.modelAngleX = var54.xan2d; - var7.modelAngleY = var54.yan2d; - var7.modelZoom = var54.zoom2d * 100 / var6; - ScriptEvent.invalidateWidget(var7); + if (ServerPacket.field2155 == var1.serverPacket) { + SecureRandomCallable.loadRegions(true, var1.packetBuffer); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2109 == var1.serverPacket) { + AbstractWorldMapIcon.method614(class179.field2295); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2135 == var1.serverPacket) { + var16 = var3.method5582(); + byte var45 = var3.method5575(); + Varps.Varps_temp[var16] = var45; + if (Varps.Varps_main[var16] != var45) { + Varps.Varps_main[var16] = var45; + } + + BufferedSink.changeGameOptions(var16); + field814[++field648 - 1 & 31] = var16; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2125 == var1.serverPacket) { + AbstractWorldMapIcon.method614(class179.field2293); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2093 == var1.serverPacket) { + var16 = var3.readUnsignedByte(); + if (var3.readUnsignedByte() == 0) { + grandExchangeOffers[var16] = new GrandExchangeOffer(); + var3.offset += 18; } else { - var7.itemId = var5; - var7.itemQuantity = var6; - var54 = Interpreter.ItemDefinition_get(var5); - var7.modelAngleX = var54.xan2d; - var7.modelAngleY = var54.yan2d; - var7.modelAngleZ = var54.zan2d; - var7.modelOffsetX = var54.offsetX2d; - var7.modelOffsetY = var54.offsetY2d; - var7.modelZoom = var54.zoom2d; - if (var54.isStackable == 1) { - var7.itemQuantityMode = 1; - } else { - var7.itemQuantityMode = 2; - } + --var3.offset; + grandExchangeOffers[var16] = new GrandExchangeOffer(var3, false); + } - if (var7.field2711 > 0) { - var7.modelZoom = var7.modelZoom * 32 / var7.field2711; - } else if (var7.rawWidth > 0) { - var7.modelZoom = var7.modelZoom * 32 / var7.rawWidth; - } + field823 = cycleCntr; + var1.serverPacket = null; + return true; + } - ScriptEvent.invalidateWidget(var7); + if (ServerPacket.field2162 == var1.serverPacket) { + PlayerAppearance.field2520 = var3.method5628(); + class3.field7 = var3.method5675(); + + while (var3.offset < var1.serverPacketLength) { + var16 = var3.readUnsignedByte(); + class179 var57 = LoginScreenAnimation.method1832()[var16]; + AbstractWorldMapIcon.method614(var57); } var1.serverPacket = null; return true; } - if (ServerPacket.field2160 == var1.serverPacket) { + if (ServerPacket.field2115 == var1.serverPacket) { + rebootTimer = var3.readUnsignedShort() * 30; + field825 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2102 == var1.serverPacket) { + var16 = var3.method5590(); + var5 = var3.method5723(); + var6 = var5 >> 10 & 31; + var19 = var5 >> 5 & 31; + var8 = var5 & 31; + var9 = (var19 << 11) + (var6 << 19) + (var8 << 3); + Widget var10 = Tile.getWidget(var16); + if (var9 != var10.color) { + var10.color = var9; + LoginPacket.invalidateWidget(var10); + } + + var1.serverPacket = null; + return true; + } + + String var52; + if (ServerPacket.field2168 == var1.serverPacket) { + byte[] var40 = new byte[var1.serverPacketLength]; + var3.method5494(var40, 0, var40.length); + Buffer var56 = new Buffer(var40); + var52 = var56.readStringCp1252NullTerminated(); + class13.openURL(var52, true, false); + var1.serverPacket = null; + return true; + } + + long var21; + if (ServerPacket.field2170 == var1.serverPacket) { + var16 = var3.method5592(); + var5 = var3.method5592(); + var6 = var3.method5583(); + if (var6 == 65535) { + var6 = -1; + } + + var19 = var3.readUnsignedShort(); + if (var19 == 65535) { + var19 = -1; + } + + for (var8 = var19; var8 <= var6; ++var8) { + var21 = (long)var8 + ((long)var16 << 32); + Node var58 = widgetClickMasks.get(var21); + if (var58 != null) { + var58.remove(); + } + + widgetClickMasks.put(new IntegerNode(var5), var21); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2111 == var1.serverPacket) { var16 = var3.readInt(); var5 = var3.readUnsignedShort(); if (var16 < -70000) { @@ -4947,330 +4881,78 @@ public final class Client extends GameShell implements Usernamed { } if (var16 >= 0) { - var17 = Language.getWidget(var16); + var17 = Tile.getWidget(var16); } else { var17 = null; } if (var17 != null) { - for (var18 = 0; var18 < var17.itemIds.length; ++var18) { - var17.itemIds[var18] = 0; - var17.itemQuantities[var18] = 0; + for (var19 = 0; var19 < var17.itemIds.length; ++var19) { + var17.itemIds[var19] = 0; + var17.itemQuantities[var19] = 0; } } - WorldMapAreaData.clearItemContainer(var5); - var18 = var3.readUnsignedShort(); + FriendSystem.clearItemContainer(var5); + var19 = var3.readUnsignedShort(); - for (var8 = 0; var8 < var18; ++var8) { - var9 = var3.method5728(); + for (var8 = 0; var8 < var19; ++var8) { + var9 = var3.method5572(); if (var9 == 255) { - var9 = var3.readInt(); + var9 = var3.method5592(); } - var33 = var3.method5719(); + var20 = var3.readUnsignedShort(); if (var17 != null && var8 < var17.itemIds.length) { - var17.itemIds[var8] = var33; + var17.itemIds[var8] = var20; var17.itemQuantities[var8] = var9; } - WorldMapDecorationType.itemContainerSetItem(var5, var8, var33 - 1, var9); + Canvas.itemContainerSetItem(var5, var8, var20 - 1, var9); } if (var17 != null) { - ScriptEvent.invalidateWidget(var17); + LoginPacket.invalidateWidget(var17); } - class312.method6006(); - changedItemContainers[++field898 - 1 & 31] = var5 & 32767; + Buddy.method5211(); + changedItemContainers[++field701 - 1 & 31] = var5 & 32767; var1.serverPacket = null; return true; } - if (ServerPacket.field2144 == var1.serverPacket) { - isCameraLocked = true; - class49.field417 = var3.readUnsignedByte() * 16384; - SecureRandomFuture.field1242 = var3.readUnsignedByte() * 128; - WorldMapCacheName.field308 = var3.readUnsignedShort(); - FriendLoginUpdate.field3643 = var3.readUnsignedByte(); - BuddyRankComparator.field1998 = var3.readUnsignedByte(); - if (BuddyRankComparator.field1998 >= 100) { - var16 = class49.field417 * 128 + 64; - var5 = SecureRandomFuture.field1242 * 16384 + 64; - var6 = class195.getTileHeight(var16, var5, ClientPacket.Client_plane) - WorldMapCacheName.field308; - var18 = var16 - class30.cameraX; - var8 = var6 - GameObject.cameraY; - var9 = var5 - FloorDecoration.cameraZ; - var33 = (int)Math.sqrt((double)(var18 * var18 + var9 * var9)); - ItemContainer.cameraPitch = (int)(Math.atan2((double)var8, (double)var33) * 325.949D) & 2047; - Decimator.cameraYaw = (int)(Math.atan2((double)var18, (double)var9) * -325.949D) & 2047; - if (ItemContainer.cameraPitch < 128) { - ItemContainer.cameraPitch = 128; - } - - if (ItemContainer.cameraPitch > 383) { - ItemContainer.cameraPitch = 383; - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2138 == var1.serverPacket) { - WorldMapRegion.loadRegions(true, var1.packetBuffer); - var1.serverPacket = null; - return true; - } - - String var48; - if (ServerPacket.field2193 == var1.serverPacket) { - byte[] var40 = new byte[var1.serverPacketLength]; - var3.method5551(var40, 0, var40.length); - Buffer var55 = new Buffer(var40); - var48 = var55.readStringCp1252NullTerminated(); - WorldMapAreaData.openURL(var48, true, false); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2206 == var1.serverPacket) { - var39 = var3.readStringCp1252NullTerminated(); - var19 = AbstractFont.escapeBrackets(class191.method3720(GrandExchangeOfferUnitPriceComparator.method142(var3))); - GrandExchangeOfferAgeComparator.addGameMessage(6, var39, var19); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2161 == var1.serverPacket) { - HealthBarUpdate.method1779(class185.field2334); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2172 == var1.serverPacket) { - var16 = var3.readInt(); - var5 = var3.readInt(); - var6 = Projectile.getGcDuration(); - PacketBufferNode var41 = ModelData0.getPacketBufferNode(ClientPacket.field2228, packetWriter.isaacCipher); - var41.packetBuffer.method5647(var16); - var41.packetBuffer.method5811(var5); - var41.packetBuffer.writeIntME(GameShell.fps); - var41.packetBuffer.method5598(var6); - packetWriter.addNode(var41); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2147 == var1.serverPacket) { - World var38 = new World(); - var38.host = var3.readStringCp1252NullTerminated(); - var38.id = var3.readUnsignedShort(); - var5 = var3.readInt(); - var38.properties = var5; - class81.updateGameState(45); - var2.close(); - var2 = null; - GrandExchangeOfferAgeComparator.changeWorld(var38); - var1.serverPacket = null; - return false; - } - - if (ServerPacket.field2158 == var1.serverPacket) { - var16 = var3.method5641(); - var5 = var3.method5650(); - var6 = var3.method5719(); - var18 = var3.readUnsignedShort(); - var52 = Language.getWidget(var5); - if (var6 != var52.modelAngleX || var16 != var52.modelAngleY || var18 != var52.modelZoom) { - var52.modelAngleX = var6; - var52.modelAngleY = var16; - var52.modelZoom = var18; - ScriptEvent.invalidateWidget(var52); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2189 == var1.serverPacket) { - for (var16 = 0; var16 < VarpDefinition.VarpDefinition_fileCount; ++var16) { - VarpDefinition var53 = NetCache.VarpDefinition_get(var16); - if (var53 != null) { - Varps.Varps_temp[var16] = 0; - Varps.Varps_main[var16] = 0; - } - } - - class312.method6006(); - field829 += 32; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2173 == var1.serverPacket) { - class192.readReflectionCheck(var3, var1.serverPacketLength); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2196 == var1.serverPacket) { - var16 = var3.readUShortSmart(); - boolean var42 = var3.readUnsignedByte() == 1; - var48 = ""; - boolean var49 = false; - if (var42) { - var48 = var3.readStringCp1252NullTerminated(); - if (VertexNormal.friendSystem.isIgnored(new Username(var48, WorldMapLabelSize.loginType))) { - var49 = true; - } - } - - String var20 = var3.readStringCp1252NullTerminated(); - if (!var49) { - GrandExchangeOfferAgeComparator.addGameMessage(var16, var48, var20); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2198 == var1.serverPacket) { - VertexNormal.friendSystem.ignoreList.read(var3, var1.serverPacketLength); - Language.FriendSystem_invalidateIgnoreds(); - field833 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2170 == var1.serverPacket) { - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.method5329(var3); - } - - ObjectSound.method1936(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2179 == var1.serverPacket) { - var16 = var3.method5640(); - GrandExchangeEvent.method91(var16); - changedItemContainers[++field898 - 1 & 31] = var16 & 32767; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2192 == var1.serverPacket) { - var16 = var3.readUnsignedShort(); - var5 = var3.readUnsignedByte(); - var6 = var3.readUnsignedShort(); - FileSystem.queueSoundEffect(var16, var5, var6); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2143 == var1.serverPacket) { - class43.method823(var3.readStringCp1252NullTerminated()); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2142 == var1.serverPacket) { - rebootTimer = var3.method5640() * 30; - field834 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2200 == var1.serverPacket) { - class40.logOut(); - var1.serverPacket = null; - return false; - } - - if (ServerPacket.field2151 == var1.serverPacket) { - MusicPatchNode.privateChatMode = User.method5131(var3.readUnsignedByte()); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2171 == var1.serverPacket) { - class227.field3092 = var3.readUnsignedByte(); - class40.field343 = var3.method5728(); - - for (var16 = class227.field3092; var16 < class227.field3092 + 8; ++var16) { - for (var5 = class40.field343; var5 < class40.field343 + 8; ++var5) { - if (groundItems[ClientPacket.Client_plane][var16][var5] != null) { - groundItems[ClientPacket.Client_plane][var16][var5] = null; - HealthBar.updateItemPile(var16, var5); - } - } - } - - for (PendingSpawn var37 = (PendingSpawn)pendingSpawns.last(); var37 != null; var37 = (PendingSpawn)pendingSpawns.previous()) { - if (var37.x >= class227.field3092 && var37.x < class227.field3092 + 8 && var37.y >= class40.field343 && var37.y < class40.field343 + 8 && var37.plane == ClientPacket.Client_plane) { - var37.hitpoints = 0; - } + if (ServerPacket.field2167 == var1.serverPacket) { + if (Calendar.clanChat != null) { + Calendar.clanChat.method5262(var3); } + PlayerAppearance.method4011(); var1.serverPacket = null; return true; } boolean var47; - if (ServerPacket.field2187 == var1.serverPacket) { - var47 = var3.readUnsignedByte() == 1; - if (var47) { - class65.field604 = TaskHandler.currentTimeMillis() - var3.readLong(); - SoundCache.grandExchangeEvents = new GrandExchangeEvents(var3, true); - } else { - SoundCache.grandExchangeEvents = null; + if (ServerPacket.field2156 == var1.serverPacket) { + var47 = var3.method5675() == 1; + var5 = var3.readInt(); + var17 = Tile.getWidget(var5); + if (var47 != var17.isHidden) { + var17.isHidden = var47; + LoginPacket.invalidateWidget(var17); } - field734 = cycleCntr; var1.serverPacket = null; return true; } - Widget var50; - if (ServerPacket.field2202 == var1.serverPacket) { - var16 = var3.method5588(); - var50 = Language.getWidget(var16); - - for (var6 = 0; var6 < var50.itemIds.length; ++var6) { - var50.itemIds[var6] = -1; - var50.itemIds[var6] = 0; - } - - ScriptEvent.invalidateWidget(var50); + if (ServerPacket.field2144 == var1.serverPacket) { + var16 = var3.readUnsignedByte(); + FontName.method5376(var16); var1.serverPacket = null; return true; } - if (ServerPacket.field2191 == var1.serverPacket) { - HealthBarUpdate.method1779(class185.field2341); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2148 == var1.serverPacket) { - if (var1.serverPacketLength == 0) { - InterfaceParent.clanChat = null; - } else { - if (InterfaceParent.clanChat == null) { - InterfaceParent.clanChat = new ClanChat(WorldMapLabelSize.loginType, AbstractWorldMapIcon.client); - } - - InterfaceParent.clanChat.readUpdate(var3); - } - - ObjectSound.method1936(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2129 == var1.serverPacket) { + if (ServerPacket.field2086 == var1.serverPacket) { hintArrowType = var3.readUnsignedByte(); if (hintArrowType == 1) { hintArrowNpcIndex = var3.readUnsignedShort(); @@ -5278,28 +4960,28 @@ public final class Client extends GameShell implements Usernamed { if (hintArrowType >= 2 && hintArrowType <= 6) { if (hintArrowType == 2) { - hintArrowSubX = 4096; - hintArrowSubY = 4096; + hintArrowSubX = 64; + hintArrowSubY = 64; } if (hintArrowType == 3) { hintArrowSubX = 0; - hintArrowSubY = 4096; + hintArrowSubY = 64; } if (hintArrowType == 4) { - hintArrowSubX = 8192; - hintArrowSubY = 4096; + hintArrowSubX = 128; + hintArrowSubY = 64; } if (hintArrowType == 5) { - hintArrowSubX = 4096; + hintArrowSubX = 64; hintArrowSubY = 0; } if (hintArrowType == 6) { - hintArrowSubX = 4096; - hintArrowSubY = 8192; + hintArrowSubX = 64; + hintArrowSubY = 128; } hintArrowType = 2; @@ -5316,60 +4998,74 @@ public final class Client extends GameShell implements Usernamed { return true; } - if (ServerPacket.field2184 == var1.serverPacket) { - minimapState = var3.readUnsignedByte(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2165 == var1.serverPacket) { - var16 = var3.readUnsignedShort(); - if (var16 == 65535) { - var16 = -1; - } - - AttackOption.playSong(var16); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2152 == var1.serverPacket) { - var16 = var3.method5640(); - if (var16 == 65535) { - var16 = -1; - } - - var5 = var3.method5645(); - MouseHandler.playSoundJingle(var16, var5); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2213 == var1.serverPacket) { - var47 = var3.readBoolean(); - if (var47) { - if (InvDefinition.field3210 == null) { - InvDefinition.field3210 = new class237(); + if (ServerPacket.field2117 == var1.serverPacket) { + isCameraLocked = true; + class80.field1111 = var3.readUnsignedByte() * 16384; + Ignored.field3589 = var3.readUnsignedByte() * 128; + field873 = var3.readUnsignedShort(); + PacketBufferNode.field2310 = var3.readUnsignedByte(); + GrandExchangeOfferOwnWorldComparator.field623 = var3.readUnsignedByte(); + if (GrandExchangeOfferOwnWorldComparator.field623 >= 100) { + var16 = class80.field1111 * 128 + 64; + var5 = Ignored.field3589 * 16384 + 64; + var6 = ScriptEvent.getTileHeight(var16, var5, UrlRequest.Client_plane) - field873; + var19 = var16 - MusicPatchNode2.cameraX; + var8 = var6 - class60.cameraY; + var9 = var5 - UserComparator9.cameraZ; + var20 = (int)Math.sqrt((double)(var19 * var19 + var9 * var9)); + ViewportMouse.cameraPitch = (int)(Math.atan2((double)var8, (double)var20) * 325.949D) & 2047; + WorldMapLabelSize.cameraYaw = (int)(Math.atan2((double)var19, (double)var9) * -325.949D) & 2047; + if (ViewportMouse.cameraPitch < 128) { + ViewportMouse.cameraPitch = 128; + } + + if (ViewportMouse.cameraPitch > 383) { + ViewportMouse.cameraPitch = 383; } - } else { - InvDefinition.field3210 = null; } var1.serverPacket = null; return true; } - if (ServerPacket.field2131 == var1.serverPacket) { - var16 = var3.method5719(); - var5 = var3.readInt(); - var6 = var16 >> 10 & 31; - var18 = var16 >> 5 & 31; - var8 = var16 & 31; - var9 = (var18 << 11) + (var6 << 19) + (var8 << 3); - Widget var32 = Language.getWidget(var5); - if (var9 != var32.color) { - var32.color = var9; - ScriptEvent.invalidateWidget(var32); + if (ServerPacket.field2094 == var1.serverPacket) { + PlayerAppearance.field2520 = var3.readUnsignedByte(); + class3.field7 = var3.method5675(); + + for (var16 = class3.field7; var16 < class3.field7 + 8; ++var16) { + for (var5 = PlayerAppearance.field2520; var5 < PlayerAppearance.field2520 + 8; ++var5) { + if (groundItems[UrlRequest.Client_plane][var16][var5] != null) { + groundItems[UrlRequest.Client_plane][var16][var5] = null; + Skills.updateItemPile(var16, var5); + } + } + } + + for (PendingSpawn var39 = (PendingSpawn)pendingSpawns.last(); var39 != null; var39 = (PendingSpawn)pendingSpawns.previous()) { + if (var39.x >= class3.field7 && var39.x < class3.field7 + 8 && var39.y >= PlayerAppearance.field2520 && var39.y < PlayerAppearance.field2520 + 8 && var39.plane == UrlRequest.Client_plane) { + var39.hitpoints = 0; + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2092 == var1.serverPacket) { + var16 = var3.readUShortSmart(); + boolean var44 = var3.readUnsignedByte() == 1; + var52 = ""; + boolean var54 = false; + if (var44) { + var52 = var3.readStringCp1252NullTerminated(); + if (Message.friendSystem.isIgnored(new Username(var52, class188.loginType))) { + var54 = true; + } + } + + String var60 = var3.readStringCp1252NullTerminated(); + if (!var54) { + class83.addGameMessage(var16, var52, var60); } var1.serverPacket = null; @@ -5377,19 +5073,94 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field2139 == var1.serverPacket) { - var16 = var3.method5650(); - var5 = var3.method5765(); - var6 = var3.readShort(); - var7 = Language.getWidget(var16); - if (var5 != var7.rawX || var6 != var7.rawY || var7.xAlignment != 0 || var7.yAlignment != 0) { - var7.rawX = var5; - var7.rawY = var6; - var7.xAlignment = 0; - var7.yAlignment = 0; - ScriptEvent.invalidateWidget(var7); - this.alignWidget(var7); - if (var7.type == 0) { - MilliClock.revalidateWidgetScroll(FloorDecoration.Widget_interfaceComponents[var16 >> 16], var7, false); + Message.friendSystem.readUpdate(var3, var1.serverPacketLength); + field711 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2089 == var1.serverPacket) { + isCameraLocked = true; + SequenceDefinition.field3477 = var3.readUnsignedByte() * 16384; + AbstractWorldMapData.field147 = var3.readUnsignedByte() * 16384; + Canvas.field397 = var3.readUnsignedShort(); + HitSplatDefinition.field3312 = var3.readUnsignedByte(); + WorldMapData_0.field92 = var3.readUnsignedByte(); + if (WorldMapData_0.field92 >= 100) { + MusicPatchNode2.cameraX = SequenceDefinition.field3477 * 128 + 64; + UserComparator9.cameraZ = AbstractWorldMapData.field147 * 128 + 64; + class60.cameraY = ScriptEvent.getTileHeight(MusicPatchNode2.cameraX, UserComparator9.cameraZ, UrlRequest.Client_plane) - Canvas.field397; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2146 == var1.serverPacket) { + var16 = var3.readUnsignedShort(); + rootInterface = var16; + this.resizeRoot(false); + GameShell.Widget_resetModelFrames(var16); + Players.runWidgetOnLoadListener(rootInterface); + + for (var5 = 0; var5 < 100; ++var5) { + field833[var5] = true; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2090 == var1.serverPacket) { + publicChatMode = var3.method5572(); + tradeChatMode = var3.method5675(); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2123 == var1.serverPacket) { + AbstractWorldMapIcon.method614(class179.field2294); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2166 == var1.serverPacket) { + Calendar.privateChatMode = class50.method893(var3.readUnsignedByte()); + var1.serverPacket = null; + return true; + } + + long var25; + long var27; + String var37; + if (ServerPacket.field2169 == var1.serverPacket) { + var37 = var3.readStringCp1252NullTerminated(); + var25 = var3.readLong(); + var27 = (long)var3.readUnsignedShort(); + var21 = (long)var3.readMedium(); + PlayerType var23 = (PlayerType)DynamicObject.findEnumerated(MusicPatchPcmStream.PlayerType_values(), var3.readUnsignedByte()); + var12 = var21 + (var27 << 32); + boolean var46 = false; + + for (int var15 = 0; var15 < 100; ++var15) { + if (field707[var15] == var12) { + var46 = true; + break; + } + } + + if (var23.isUser && Message.friendSystem.isIgnored(new Username(var37, class188.loginType))) { + var46 = true; + } + + if (!var46 && field678 == 0) { + field707[field682] = var12; + field682 = (field682 + 1) % 100; + String var29 = AbstractFont.escapeBrackets(Buddy.method5214(GraphicsObject.method2028(var3))); + if (var23.modIcon != -1) { + GameShell.addChatMessage(9, ChatChannel.method2269(var23.modIcon) + var37, var29, CollisionMap.base37DecodeLong(var25)); + } else { + GameShell.addChatMessage(9, var37, var29, CollisionMap.base37DecodeLong(var25)); } } @@ -5397,207 +5168,622 @@ public final class Client extends GameShell implements Usernamed { return true; } - if (ServerPacket.field2178 == var1.serverPacket) { - HealthBarUpdate.method1779(class185.field2336); + if (ServerPacket.field2131 == var1.serverPacket) { + WorldMapElement.method4381(var3.readStringCp1252NullTerminated()); var1.serverPacket = null; return true; } - if (ServerPacket.field2208 == var1.serverPacket) { - var16 = var3.readInt(); - if (var16 != field748) { - field748 = var16; - class3.method41(); + Widget var24; + if (ServerPacket.field2133 == var1.serverPacket) { + var16 = var3.method5591(); + var5 = var3.method5590(); + InterfaceParent var50 = (InterfaceParent)interfaceParents.get((long)var5); + var41 = (InterfaceParent)interfaceParents.get((long)var16); + if (var41 != null) { + VarpDefinition.closeInterface(var41, var50 == null || var41.group != var50.group); + } + + if (var50 != null) { + var50.remove(); + interfaceParents.put(var50, (long)var16); + } + + var24 = Tile.getWidget(var5); + if (var24 != null) { + LoginPacket.invalidateWidget(var24); + } + + var24 = Tile.getWidget(var16); + if (var24 != null) { + LoginPacket.invalidateWidget(var24); + Messages.revalidateWidgetScroll(UserComparator7.Widget_interfaceComponents[var24.id >>> 16], var24, true); + } + + if (rootInterface != -1) { + ItemContainer.runIntfCloseListeners(rootInterface, 1); } var1.serverPacket = null; return true; } - if (ServerPacket.field2157 == var1.serverPacket) { - HealthBarUpdate.method1779(class185.field2339); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2204 == var1.serverPacket) { - publicChatMode = var3.method5689(); - tradeChatMode = var3.method5689(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2135 == var1.serverPacket) { - HealthBarUpdate.method1779(class185.field2335); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2209 == var1.serverPacket) { - var47 = var3.method5728() == 1; - var5 = var3.method5650(); - var17 = Language.getWidget(var5); - if (var47 != var17.isHidden) { - var17.isHidden = var47; - ScriptEvent.invalidateWidget(var17); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2159 == var1.serverPacket) { - var16 = var3.readUnsignedByte(); - if (var3.readUnsignedByte() == 0) { - grandExchangeOffers[var16] = new GrandExchangeOffer(); - var3.offset += 18; + if (ServerPacket.field2087 == var1.serverPacket) { + var47 = var3.readUnsignedByte() == 1; + if (var47) { + TileItemPile.field1522 = WorldMapID.currentTimeMillis() - var3.readLong(); + Script.grandExchangeEvents = new GrandExchangeEvents(var3, true); } else { - --var3.offset; - grandExchangeOffers[var16] = new GrandExchangeOffer(var3, false); + Script.grandExchangeEvents = null; } - field645 = cycleCntr; + field860 = cycleCntr; var1.serverPacket = null; return true; } - if (ServerPacket.field2177 == var1.serverPacket) { - WorldMapSection2.updateNpcs(false, var3); + if (ServerPacket.field2141 == var1.serverPacket) { + var16 = var3.readInt(); + var55 = Tile.getWidget(var16); + var55.modelType = 3; + var55.modelId = Message.localPlayer.appearance.getChatHeadId(); + LoginPacket.invalidateWidget(var55); var1.serverPacket = null; return true; } - if (ServerPacket.field2180 == var1.serverPacket) { - WorldMapSection2.updateNpcs(true, var3); + if (ServerPacket.field2165 == var1.serverPacket) { + class65.updatePlayers(var3, var1.serverPacketLength); + GraphicsObject.method2030(); var1.serverPacket = null; return true; } - if (ServerPacket.field2162 == var1.serverPacket) { - var16 = var3.method5650(); - var50 = Language.getWidget(var16); - var50.modelType = 3; - var50.modelId = class215.localPlayer.appearance.getChatHeadId(); - ScriptEvent.invalidateWidget(var50); + if (ServerPacket.field2116 == var1.serverPacket) { + SecureRandomCallable.loadRegions(false, var1.packetBuffer); var1.serverPacket = null; return true; } - Calendar.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id : -1) + "," + (var1.field1311 != null ? var1.field1311.id : -1) + "," + (var1.field1312 != null ? var1.field1312.id : -1) + "," + var1.serverPacketLength, (Throwable)null); - class40.logOut(); + if (ServerPacket.field2126 == var1.serverPacket) { + var16 = var3.readUnsignedShort(); + var5 = var3.method5675(); + var6 = var3.method5590(); + var41 = (InterfaceParent)interfaceParents.get((long)var6); + if (var41 != null) { + VarpDefinition.closeInterface(var41, var16 != var41.group); + } + + ScriptFrame.method1107(var6, var16, var5); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2130 == var1.serverPacket) { + var16 = var3.method5723(); + if (var16 == 65535) { + var16 = -1; + } + + var5 = var3.readInt(); + var6 = var3.method5591(); + var7 = Tile.getWidget(var5); + ItemDefinition var59; + if (!var7.isIf3) { + if (var16 == -1) { + var7.modelType = 0; + var1.serverPacket = null; + return true; + } + + var59 = PacketBufferNode.ItemDefinition_get(var16); + var7.modelType = 4; + var7.modelId = var16; + var7.modelAngleX = var59.xan2d; + var7.modelAngleY = var59.yan2d; + var7.modelZoom = var59.zoom2d * 100 / var6; + LoginPacket.invalidateWidget(var7); + } else { + var7.itemId = var16; + var7.itemQuantity = var6; + var59 = PacketBufferNode.ItemDefinition_get(var16); + var7.modelAngleX = var59.xan2d; + var7.modelAngleY = var59.yan2d; + var7.modelAngleZ = var59.zan2d; + var7.modelOffsetX = var59.offsetX2d; + var7.modelOffsetY = var59.offsetY2d; + var7.modelZoom = var59.zoom2d; + if (var59.isStackable == 1) { + var7.itemQuantityMode = 1; + } else { + var7.itemQuantityMode = 2; + } + + if (var7.field2645 > 0) { + var7.modelZoom = var7.modelZoom * 32 / var7.field2645; + } else if (var7.rawWidth > 0) { + var7.modelZoom = var7.modelZoom * 32 / var7.rawWidth; + } + + LoginPacket.invalidateWidget(var7); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2171 == var1.serverPacket) { + class3.field7 = var3.method5572(); + PlayerAppearance.field2520 = var3.method5628(); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2151 == var1.serverPacket) { + var3.offset += 28; + if (var3.checkCrc()) { + class48.method859(var3, var3.offset - 28); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2129 == var1.serverPacket) { + var37 = var3.readStringCp1252NullTerminated(); + var5 = var3.method5675(); + var6 = var3.method5628(); + if (var6 >= 1 && var6 <= 8) { + if (var37.equalsIgnoreCase("null")) { + var37 = null; + } + + playerMenuActions[var6 - 1] = var37; + playerOptionsPriorities[var6 - 1] = var5 == 0; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2127 == var1.serverPacket) { + var16 = var3.readUnsignedByte(); + WorldMapData_0.forceDisconnect(var16); + var1.serverPacket = null; + return false; + } + + if (ServerPacket.field2101 == var1.serverPacket) { + AbstractWorldMapIcon.method614(class179.field2292); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2149 == var1.serverPacket) { + var37 = var3.readStringCp1252NullTerminated(); + var18 = AbstractFont.escapeBrackets(Buddy.method5214(GraphicsObject.method2028(var3))); + class83.addGameMessage(6, var37, var18); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2136 == var1.serverPacket) { + class117.readReflectionCheck(var3, var1.serverPacketLength); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2097 == var1.serverPacket) { + var16 = var3.method5723(); + GrandExchangeOfferWorldComparator.method70(var16); + changedItemContainers[++field701 - 1 & 31] = var16 & 32767; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2099 == var1.serverPacket) { + World var38 = new World(); + var38.host = var3.readStringCp1252NullTerminated(); + var38.id = var3.readUnsignedShort(); + var5 = var3.readInt(); + var38.properties = var5; + class195.updateGameState(45); + var2.close(); + var2 = null; + KeyHandler.changeWorld(var38); + var1.serverPacket = null; + return false; + } + + if (ServerPacket.field2119 == var1.serverPacket) { + var16 = var3.method5582(); + var5 = var3.method5582(); + var6 = var3.method5723(); + var19 = var3.readInt(); + var24 = Tile.getWidget(var19); + if (var5 != var24.modelAngleX || var6 != var24.modelAngleY || var16 != var24.modelZoom) { + var24.modelAngleX = var5; + var24.modelAngleY = var6; + var24.modelZoom = var16; + LoginPacket.invalidateWidget(var24); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2106 == var1.serverPacket) { + if (var1.serverPacketLength == 0) { + Calendar.clanChat = null; + } else { + if (Calendar.clanChat == null) { + Calendar.clanChat = new ClanChat(class188.loginType, class206.client); + } + + Calendar.clanChat.readUpdate(var3); + } + + PlayerAppearance.method4011(); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2145 == var1.serverPacket) { + var37 = var3.readStringCp1252NullTerminated(); + Object[] var53 = new Object[var37.length() + 1]; + + for (var6 = var37.length() - 1; var6 >= 0; --var6) { + if (var37.charAt(var6) == 's') { + var53[var6 + 1] = var3.readStringCp1252NullTerminated(); + } else { + var53[var6 + 1] = new Integer(var3.readInt()); + } + } + + var53[0] = new Integer(var3.readInt()); + ScriptEvent var48 = new ScriptEvent(); + var48.args = var53; + runScriptEvent(var48); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2091 == var1.serverPacket) { + var16 = var3.readUnsignedByte(); + var5 = var3.readUnsignedByte(); + var6 = var3.readUnsignedByte(); + var19 = var3.readUnsignedByte(); + field779[var16] = true; + field875[var16] = var5; + field876[var16] = var6; + field877[var16] = var19; + field878[var16] = 0; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2098 == var1.serverPacket) { + destinationX = var3.readUnsignedByte(); + if (destinationX == 255) { + destinationX = 0; + } + + destinationY = var3.readUnsignedByte(); + if (destinationY == 255) { + destinationY = 0; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2121 == var1.serverPacket) { + var16 = var3.readInt(); + var5 = var3.method5723(); + var17 = Tile.getWidget(var16); + if (var17.modelType != 2 || var5 != var17.modelId) { + var17.modelType = 2; + var17.modelId = var5; + LoginPacket.invalidateWidget(var17); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2124 == var1.serverPacket) { + var16 = var3.method5584(); + var5 = var3.method5591(); + var6 = var3.method5565(); + var7 = Tile.getWidget(var5); + if (var6 != var7.rawX || var16 != var7.rawY || var7.xAlignment != 0 || var7.yAlignment != 0) { + var7.rawX = var6; + var7.rawY = var16; + var7.xAlignment = 0; + var7.yAlignment = 0; + LoginPacket.invalidateWidget(var7); + this.alignWidget(var7); + if (var7.type == 0) { + Messages.revalidateWidgetScroll(UserComparator7.Widget_interfaceComponents[var5 >> 16], var7, false); + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2158 == var1.serverPacket) { + if (rootInterface != -1) { + ItemContainer.runIntfCloseListeners(rootInterface, 0); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2150 == var1.serverPacket) { + var37 = var3.readStringCp1252NullTerminated(); + var25 = (long)var3.readUnsignedShort(); + var27 = (long)var3.readMedium(); + PlayerType var30 = (PlayerType)DynamicObject.findEnumerated(MusicPatchPcmStream.PlayerType_values(), var3.readUnsignedByte()); + long var31 = (var25 << 32) + var27; + boolean var33 = false; + + for (int var13 = 0; var13 < 100; ++var13) { + if (var31 == field707[var13]) { + var33 = true; + break; + } + } + + if (Message.friendSystem.isIgnored(new Username(var37, class188.loginType))) { + var33 = true; + } + + if (!var33 && field678 == 0) { + field707[field682] = var31; + field682 = (field682 + 1) % 100; + String var34 = AbstractFont.escapeBrackets(Buddy.method5214(GraphicsObject.method2028(var3))); + byte var14; + if (var30.isPrivileged) { + var14 = 7; + } else { + var14 = 3; + } + + if (var30.modIcon != -1) { + class83.addGameMessage(var14, ChatChannel.method2269(var30.modIcon) + var37, var34); + } else { + class83.addGameMessage(var14, var37, var34); + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2143 == var1.serverPacket) { + var16 = var3.readInt(); + InterfaceParent var51 = (InterfaceParent)interfaceParents.get((long)var16); + if (var51 != null) { + VarpDefinition.closeInterface(var51, true); + } + + if (meslayerContinueWidget != null) { + LoginPacket.invalidateWidget(meslayerContinueWidget); + meslayerContinueWidget = null; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2161 == var1.serverPacket) { + var16 = var3.readInt(); + var5 = var3.readUnsignedShort(); + if (var16 < -70000) { + var5 += 32768; + } + + if (var16 >= 0) { + var17 = Tile.getWidget(var16); + } else { + var17 = null; + } + + for (; var3.offset < var1.serverPacketLength; Canvas.itemContainerSetItem(var5, var19, var8 - 1, var9)) { + var19 = var3.readUShortSmart(); + var8 = var3.readUnsignedShort(); + var9 = 0; + if (var8 != 0) { + var9 = var3.readUnsignedByte(); + if (var9 == 255) { + var9 = var3.readInt(); + } + } + + if (var17 != null && var19 >= 0 && var19 < var17.itemIds.length) { + var17.itemIds[var19] = var8; + var17.itemQuantities[var19] = var9; + } + } + + if (var17 != null) { + LoginPacket.invalidateWidget(var17); + } + + Buddy.method5211(); + changedItemContainers[++field701 - 1 & 31] = var5 & 32767; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2132 == var1.serverPacket) { + Buddy.method5211(); + weight = var3.readShort(); + field825 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2118 == var1.serverPacket) { + for (var16 = 0; var16 < VarpDefinition.VarpDefinition_fileCount; ++var16) { + VarpDefinition var49 = UserComparator8.VarpDefinition_get(var16); + if (var49 != null) { + Varps.Varps_temp[var16] = 0; + Varps.Varps_main[var16] = 0; + } + } + + Buddy.method5211(); + field648 += 32; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2137 == var1.serverPacket) { + AbstractWorldMapIcon.method614(class179.field2296); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2173 == var1.serverPacket) { + var47 = var3.readBoolean(); + if (var47) { + if (class215.field2534 == null) { + class215.field2534 = new class237(); + } + } else { + class215.field2534 = null; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2108 == var1.serverPacket) { + AbstractWorldMapIcon.method614(class179.field2291); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2105 == var1.serverPacket) { + WorldMapRectangle.updateNpcs(false, var3); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2096 == var1.serverPacket) { + var16 = var3.method5592(); + var18 = var3.readStringCp1252NullTerminated(); + var17 = Tile.getWidget(var16); + if (!var18.equals(var17.text)) { + var17.text = var18; + LoginPacket.invalidateWidget(var17); + } + + var1.serverPacket = null; + return true; + } + + DesktopPlatformInfoProvider.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id : -1) + "," + (var1.field1301 != null ? var1.field1301.id : -1) + "," + (var1.field1299 != null ? var1.field1299.id : -1) + "," + var1.serverPacketLength, (Throwable)null); + InterfaceParent.logOut(); } catch (IOException var35) { - Projectile.method2137(); + StudioGame.method4119(); } catch (Exception var36) { - var19 = "" + (var1.serverPacket != null ? var1.serverPacket.id : -1) + "," + (var1.field1311 != null ? var1.field1311.id : -1) + "," + (var1.field1312 != null ? var1.field1312.id : -1) + "," + var1.serverPacketLength + "," + (class215.localPlayer.pathX[0] + class51.baseX * 64) + "," + (class215.localPlayer.pathY[0] + VarcInt.baseY * 64) + ","; + var18 = "" + (var1.serverPacket != null ? var1.serverPacket.id : -1) + "," + (var1.field1301 != null ? var1.field1301.id : -1) + "," + (var1.field1299 != null ? var1.field1299.id : -1) + "," + var1.serverPacketLength + "," + (Message.localPlayer.pathX[0] + MusicPatchPcmStream.baseX * 64) + "," + (Message.localPlayer.pathY[0] + ScriptEvent.baseY * 64) + ","; for (var6 = 0; var6 < var1.serverPacketLength && var6 < 50; ++var6) { - var19 = var19 + var3.array[var6] + ","; + var18 = var18 + var3.array[var6] + ","; } - Calendar.RunException_sendStackTrace(var19, var36); - class40.logOut(); + DesktopPlatformInfoProvider.RunException_sendStackTrace(var18, var36); + InterfaceParent.logOut(); } return true; } } - @ObfuscatedName("hp") + @ObfuscatedName("ie") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "2019435319" + garbageValue = "-2088122930" ) @Export("menu") final void menu() { - PcmPlayer.method2509(); - if (DevicePcmPlayerProvider.dragInventoryWidget == null) { + WorldMapArea.method404(); + if (ClientPreferences.dragInventoryWidget == null) { if (clickedWidget == null) { int var2; + int var4; int var5; - int var6; - int var9; - int var14; - label276: { + int var10; + int var13; + label240: { int var1 = MouseHandler.MouseHandler_lastButton; - int var4; + int var3; + int var8; if (isMenuOpen) { - int var3; - int var7; - if (var1 != 1 && (JagexCache.mouseCam || var1 != 4)) { + if (var1 != 1 && (NetFileRequest.mouseCam || var1 != 4)) { var2 = MouseHandler.MouseHandler_x; var3 = MouseHandler.MouseHandler_y; - if (var2 < HealthBar.menuX - 10 || var2 > TileItemPile.menuWidth + HealthBar.menuX + 10 || var3 < class191.menuY - 10 || var3 > SoundSystem.menuHeight + class191.menuY + 10) { + if (var2 < GrandExchangeEvent.menuX - 10 || var2 > GrandExchangeEvent.menuX + KeyHandler.menuWidth + 10 || var3 < WorldMapManager.menuY - 10 || var3 > class54.menuHeight + WorldMapManager.menuY + 10) { isMenuOpen = false; - var4 = HealthBar.menuX; - var5 = class191.menuY; - var6 = TileItemPile.menuWidth; - var7 = SoundSystem.menuHeight; - - for (var14 = 0; var14 < rootWidgetCount; ++var14) { - if (rootWidgetWidths[var14] + rootWidgetXs[var14] > var4 && rootWidgetXs[var14] < var4 + var6 && rootWidgetHeights[var14] + rootWidgetYs[var14] > var5 && rootWidgetYs[var14] < var5 + var7) { - field847[var14] = true; - } - } + GameObject.method3297(GrandExchangeEvent.menuX, WorldMapManager.menuY, KeyHandler.menuWidth, class54.menuHeight); } } - if (var1 == 1 || !JagexCache.mouseCam && var1 == 4) { - var2 = HealthBar.menuX; - var3 = class191.menuY; - var4 = TileItemPile.menuWidth; + if (var1 == 1 || !NetFileRequest.mouseCam && var1 == 4) { + var2 = GrandExchangeEvent.menuX; + var3 = WorldMapManager.menuY; + var4 = KeyHandler.menuWidth; var5 = MouseHandler.MouseHandler_lastPressedX; - var6 = MouseHandler.MouseHandler_lastPressedY; - var7 = -1; + int var6 = MouseHandler.MouseHandler_lastPressedY; + int var12 = -1; - for (var14 = 0; var14 < menuOptionsCount; ++var14) { - var9 = (menuOptionsCount - 1 - var14) * 15 + var3 + 31; - if (var5 > var2 && var5 < var2 + var4 && var6 > var9 - 13 && var6 < var9 + 3) { - var7 = var14; + for (var8 = 0; var8 < menuOptionsCount; ++var8) { + var13 = (menuOptionsCount - 1 - var8) * 15 + var3 + 31; + if (var5 > var2 && var5 < var2 + var4 && var6 > var13 - 13 && var6 < var13 + 3) { + var12 = var8; } } - if (var7 != -1) { - class60.method1193(var7); + if (var12 != -1) { + MusicPatchPcmStream.method3898(var12); } isMenuOpen = false; - var14 = HealthBar.menuX; - var9 = class191.menuY; - int var10 = TileItemPile.menuWidth; - int var11 = SoundSystem.menuHeight; - - for (int var12 = 0; var12 < rootWidgetCount; ++var12) { - if (rootWidgetWidths[var12] + rootWidgetXs[var12] > var14 && rootWidgetXs[var12] < var14 + var10 && rootWidgetHeights[var12] + rootWidgetYs[var12] > var9 && rootWidgetYs[var12] < var9 + var11) { - field847[var12] = true; - } - } + GameObject.method3297(GrandExchangeEvent.menuX, WorldMapManager.menuY, KeyHandler.menuWidth, class54.menuHeight); } } else { - var2 = menuOptionsCount - 1; - if ((var1 == 1 || !JagexCache.mouseCam && var1 == 4) && var2 >= 0) { - var4 = menuOpcodes[var2]; - if (var4 == 39 || var4 == 40 || var4 == 41 || var4 == 42 || var4 == 43 || var4 == 33 || var4 == 34 || var4 == 35 || var4 == 36 || var4 == 37 || var4 == 38 || var4 == 1005) { - var5 = menuArguments1[var2]; - var6 = menuArguments2[var2]; - Widget var13 = Language.getWidget(var6); - if (class215.method4109(MenuAction.getWidgetClickMask(var13))) { - break label276; + var2 = GrandExchangeOfferOwnWorldComparator.method1288(); + if ((var1 == 1 || !NetFileRequest.mouseCam && var1 == 4) && var2 >= 0) { + var3 = menuOpcodes[var2]; + if (var3 == 39 || var3 == 40 || var3 == 41 || var3 == 42 || var3 == 43 || var3 == 33 || var3 == 34 || var3 == 35 || var3 == 36 || var3 == 37 || var3 == 38 || var3 == 1005) { + var4 = menuArguments1[var2]; + var5 = menuArguments2[var2]; + Widget var11 = Tile.getWidget(var5); + var8 = WorldMapSection0.getWidgetClickMask(var11); + boolean var7 = (var8 >> 28 & 1) != 0; + if (var7) { + break label240; } - var9 = MenuAction.getWidgetClickMask(var13); - boolean var8 = (var9 >> 29 & 1) != 0; - if (var8) { - break label276; + var10 = WorldMapSection0.getWidgetClickMask(var11); + boolean var9 = (var10 >> 29 & 1) != 0; + if (var9) { + break label240; } } } - if ((var1 == 1 || !JagexCache.mouseCam && var1 == 4) && this.shouldLeftClickOpenMenu()) { + if ((var1 == 1 || !NetFileRequest.mouseCam && var1 == 4) && this.shouldLeftClickOpenMenu()) { var1 = 2; } - if ((var1 == 1 || !JagexCache.mouseCam && var1 == 4) && menuOptionsCount > 0) { - class60.method1193(var2); + if ((var1 == 1 || !NetFileRequest.mouseCam && var1 == 4) && menuOptionsCount > 0) { + MusicPatchPcmStream.method3898(var2); } if (var1 == 2 && menuOptionsCount > 0) { @@ -5608,146 +5794,168 @@ public final class Client extends GameShell implements Usernamed { return; } - if (DevicePcmPlayerProvider.dragInventoryWidget != null && !field754 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { - var14 = field751; - var9 = field752; - Language.method3705(Tiles.tempMenuAction, var14, var9); - Tiles.tempMenuAction = null; + if (ClientPreferences.dragInventoryWidget != null && !field768 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { + var13 = field863; + var10 = field738; + Messages.method2231(LoginType.tempMenuAction, var13, var10); + LoginType.tempMenuAction = null; } - field754 = false; + field768 = false; itemDragDuration = 0; - if (DevicePcmPlayerProvider.dragInventoryWidget != null) { - ScriptEvent.invalidateWidget(DevicePcmPlayerProvider.dragInventoryWidget); + if (ClientPreferences.dragInventoryWidget != null) { + LoginPacket.invalidateWidget(ClientPreferences.dragInventoryWidget); } - DevicePcmPlayerProvider.dragInventoryWidget = Language.getWidget(var6); - dragItemSlotSource = var5; - field751 = MouseHandler.MouseHandler_lastPressedX; - field752 = MouseHandler.MouseHandler_lastPressedY; + ClientPreferences.dragInventoryWidget = Tile.getWidget(var5); + dragItemSlotSource = var4; + field863 = MouseHandler.MouseHandler_lastPressedX; + field738 = MouseHandler.MouseHandler_lastPressedY; if (var2 >= 0) { - class208.method4017(var2); + BuddyRankComparator.method3361(var2); } - ScriptEvent.invalidateWidget(DevicePcmPlayerProvider.dragInventoryWidget); + LoginPacket.invalidateWidget(ClientPreferences.dragInventoryWidget); } } } - @ObfuscatedName("hb") + @ObfuscatedName("ic") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "1175639323" + garbageValue = "-1378557318" ) @Export("shouldLeftClickOpenMenu") final boolean shouldLeftClickOpenMenu() { - int var1 = menuOptionsCount - 1; - boolean var3 = leftClickOpensMenu == 1 && menuOptionsCount > 2; - if (!var3) { - boolean var4; - if (var1 < 0) { - var4 = false; - } else { - int var5 = menuOpcodes[var1]; - if (var5 >= 2000) { - var5 -= 2000; - } - - if (var5 == 1007) { - var4 = true; - } else { - var4 = false; - } - } - - var3 = var4; - } - - return var3 && !menuShiftClick[var1]; + int var1 = GrandExchangeOfferOwnWorldComparator.method1288(); + return (leftClickOpensMenu == 1 && menuOptionsCount > 2 || MouseHandler.method1074(var1)) && !menuShiftClick[var1]; } - @ObfuscatedName("hz") + @ObfuscatedName("ia") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "-913599025" + garbageValue = "1132899725" ) @Export("openMenu") final void openMenu(int var1, int var2) { - MouseHandler.calculateMenuBounds(var1, var2); - class2.scene.menuOpen(ClientPacket.Client_plane, var1, var2, false); + int var3 = GrandExchangeOffer.fontBold12.stringWidth("Choose Option"); + + int var4; + for (var4 = 0; var4 < menuOptionsCount; ++var4) { + Font var5 = GrandExchangeOffer.fontBold12; + String var6; + if (var4 < 0) { + var6 = ""; + } else if (menuTargets[var4].length() > 0) { + var6 = menuActions[var4] + " " + menuTargets[var4]; + } else { + var6 = menuActions[var4]; + } + + int var7 = var5.stringWidth(var6); + if (var7 > var3) { + var3 = var7; + } + } + + var3 += 8; + var4 = menuOptionsCount * 15 + 22; + int var8 = var1 - var3 / 2; + if (var8 + var3 > GrandExchangeOfferTotalQuantityComparator.canvasWidth) { + var8 = GrandExchangeOfferTotalQuantityComparator.canvasWidth - var3; + } + + if (var8 < 0) { + var8 = 0; + } + + int var9 = var2; + if (var4 + var2 > AttackOption.canvasHeight) { + var9 = AttackOption.canvasHeight - var4; + } + + if (var9 < 0) { + var9 = 0; + } + + GrandExchangeEvent.menuX = var8; + WorldMapManager.menuY = var9; + KeyHandler.menuWidth = var3; + class54.menuHeight = menuOptionsCount * 15 + 22; + class14.scene.menuOpen(UrlRequest.Client_plane, var1, var2, false); isMenuOpen = true; } - @ObfuscatedName("il") + @ObfuscatedName("js") @ObfuscatedSignature( signature = "(ZI)V", - garbageValue = "731320954" + garbageValue = "-2076621933" ) @Export("resizeRoot") final void resizeRoot(boolean var1) { - WorldMapSectionType.method272(rootInterface, BoundaryObject.canvasWidth, WorldMapCacheName.canvasHeight, var1); + LoginPacket.method3572(rootInterface, GrandExchangeOfferTotalQuantityComparator.canvasWidth, AttackOption.canvasHeight, var1); } - @ObfuscatedName("iu") + @ObfuscatedName("jw") @ObfuscatedSignature( - signature = "(Lhl;B)V", - garbageValue = "49" + signature = "(Lha;I)V", + garbageValue = "-654127595" ) @Export("alignWidget") void alignWidget(Widget var1) { - Widget var2 = var1.parentId == -1 ? null : Language.getWidget(var1.parentId); + Widget var2 = var1.parentId == -1 ? null : Tile.getWidget(var1.parentId); int var3; int var4; if (var2 == null) { - var3 = BoundaryObject.canvasWidth; - var4 = WorldMapCacheName.canvasHeight; + var3 = GrandExchangeOfferTotalQuantityComparator.canvasWidth; + var4 = AttackOption.canvasHeight; } else { var3 = var2.width; var4 = var2.height; } - WorldMapSection1.alignWidgetSize(var1, var3, var4, false); - PendingSpawn.alignWidgetPosition(var1, var3, var4); + class32.alignWidgetSize(var1, var3, var4, false); + class2.alignWidgetPosition(var1, var3, var4); } - @ObfuscatedName("ju") + @ObfuscatedName("jq") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "2046016880" + garbageValue = "-642381621" ) - final void method1503() { - ScriptEvent.invalidateWidget(clickedWidget); - ++class3.widgetDragDuration; - if (field823 && field820) { + final void method1310() { + LoginPacket.invalidateWidget(clickedWidget); + ++WorldMapSection2.widgetDragDuration; + if (field809 && field806) { int var1 = MouseHandler.MouseHandler_x; int var2 = MouseHandler.MouseHandler_y; var1 -= widgetClickX; var2 -= widgetClickY; - if (var1 < field698) { - var1 = field698; + if (var1 < field807) { + var1 = field807; } - if (var1 + clickedWidget.width > field698 + clickedWidgetParent.width) { - var1 = field698 + clickedWidgetParent.width - clickedWidget.width; + if (var1 + clickedWidget.width > field807 + clickedWidgetParent.width) { + var1 = field807 + clickedWidgetParent.width - clickedWidget.width; } - if (var2 < field822) { - var2 = field822; + if (var2 < field808) { + var2 = field808; } - if (var2 + clickedWidget.height > field822 + clickedWidgetParent.height) { - var2 = field822 + clickedWidgetParent.height - clickedWidget.height; + if (var2 + clickedWidget.height > field808 + clickedWidgetParent.height) { + var2 = field808 + clickedWidgetParent.height - clickedWidget.height; } - int var3 = var1 - field808; - int var4 = var2 - field825; + int var3 = var1 - field882; + int var4 = var2 - field811; int var5 = clickedWidget.dragZoneSize; - if (class3.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { + if (WorldMapSection2.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { isDraggingWidget = true; } - int var6 = var1 - field698 + clickedWidgetParent.scrollX; - int var7 = var2 - field822 + clickedWidgetParent.scrollY; + int var6 = var1 - field807 + clickedWidgetParent.scrollX; + int var7 = var2 - field808 + clickedWidgetParent.scrollY; ScriptEvent var8; if (clickedWidget.onDrag != null && isDraggingWidget) { var8 = new ScriptEvent(); @@ -5755,7 +5963,7 @@ public final class Client extends GameShell implements Usernamed { var8.mouseX = var6; var8.mouseY = var7; var8.args = clickedWidget.onDrag; - WorldMapLabel.runScriptEvent(var8); + runScriptEvent(var8); } if (MouseHandler.MouseHandler_currentButton == 0) { @@ -5767,278 +5975,65 @@ public final class Client extends GameShell implements Usernamed { var8.mouseY = var7; var8.dragTarget = draggedOnWidget; var8.args = clickedWidget.onDragComplete; - WorldMapLabel.runScriptEvent(var8); + runScriptEvent(var8); } - if (draggedOnWidget != null) { - Widget var9 = clickedWidget; - int var11 = MenuAction.getWidgetClickMask(var9); - int var10 = var11 >> 17 & 7; - int var12 = var10; - Widget var17; - if (var10 == 0) { - var17 = null; - } else { - int var13 = 0; - - while (true) { - if (var13 >= var12) { - var17 = var9; - break; - } - - var9 = Language.getWidget(var9.parentId); - if (var9 == null) { - var17 = null; - break; - } - - ++var13; - } - } - - if (var17 != null) { - PacketBufferNode var14 = ModelData0.getPacketBufferNode(ClientPacket.field2301, packetWriter.isaacCipher); - var14.packetBuffer.writeInt(draggedOnWidget.id); - var14.packetBuffer.writeShort(draggedOnWidget.itemId); - var14.packetBuffer.writeShortLE(draggedOnWidget.childIndex); - var14.packetBuffer.method5811(clickedWidget.id); - var14.packetBuffer.writeShort(clickedWidget.itemId); - var14.packetBuffer.method5636(clickedWidget.childIndex); - packetWriter.addNode(var14); - } + if (draggedOnWidget != null && StudioGame.method4116(clickedWidget) != null) { + PacketBufferNode var11 = class2.getPacketBufferNode(ClientPacket.field2209, packetWriter.isaacCipher); + var11.packetBuffer.writeIntME(draggedOnWidget.itemId); + var11.packetBuffer.method5579(clickedWidget.itemId); + var11.packetBuffer.writeShort(clickedWidget.childIndex); + var11.packetBuffer.method5746(draggedOnWidget.childIndex); + var11.packetBuffer.writeInt(clickedWidget.id); + var11.packetBuffer.writeInt(draggedOnWidget.id); + packetWriter.addNode(var11); } } else if (this.shouldLeftClickOpenMenu()) { - this.openMenu(widgetClickX + field808, widgetClickY + field825); + this.openMenu(field882 + widgetClickX, widgetClickY + field811); } else if (menuOptionsCount > 0) { - int var15 = field808 + widgetClickX; - int var16 = field825 + widgetClickY; - Language.method3705(Tiles.tempMenuAction, var15, var16); - Tiles.tempMenuAction = null; + int var10 = widgetClickX + field882; + int var9 = widgetClickY + field811; + Messages.method2231(LoginType.tempMenuAction, var10, var9); + LoginType.tempMenuAction = null; } clickedWidget = null; } } else { - if (class3.widgetDragDuration > 1) { + if (WorldMapSection2.widgetDragDuration > 1) { clickedWidget = null; } } } - @ObfuscatedName("kt") + @ObfuscatedName("lv") @ObfuscatedSignature( - signature = "(B)Ljb;", - garbageValue = "70" + signature = "(I)Ljc;", + garbageValue = "83008429" ) @Export("username") public Username username() { - return class215.localPlayer != null ? class215.localPlayer.username : null; + return Message.localPlayer != null ? Message.localPlayer.username : null; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(II)Ljava/lang/String;", - garbageValue = "1566884695" + signature = "(Lbm;I)V", + garbageValue = "-74737560" ) - static String method1749(int var0) { - return ""; + @Export("runScriptEvent") + public static void runScriptEvent(ScriptEvent var0) { + GrandExchangeEvents.runScript(var0, 500000); } - @ObfuscatedName("b") + @ObfuscatedName("al") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-1744005886" + signature = "(IB)I", + garbageValue = "0" ) - public static int method1655(int var0) { - return var0 >> 11 & 63; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(Lkj;II)Z", - garbageValue = "-304415456" - ) - @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 (players[var1] != null) { - throw new RuntimeException(); - } else { - Player var6 = players[var1] = new Player(); - var6.index = var1; - if (Players.field1248[var1] != null) { - var6.read(Players.field1248[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.field1247[var1]; - var6.plane = (byte)var8; - var6.resetPath((var9 << 13) + var3 - class51.baseX * 64, (var10 << 13) + var4 - VarcInt.baseY * 64); - var6.field630 = false; - return true; - } - } else if (var2 == 1) { - var3 = var0.readBits(2); - var4 = Players.Players_regions[var1]; - Players.Players_regions[var1] = (((var4 >> 28) + var3 & 3) << 28) + (var4 & 268435455); - return false; - } else { - int var5; - int var11; - if (var2 == 2) { - var3 = var0.readBits(5); - var4 = var3 >> 3; - var5 = var3 & 7; - var11 = Players.Players_regions[var1]; - var7 = (var11 >> 28) + var4 & 3; - var8 = var11 >> 14 & 255; - var9 = var11 & 255; - if (var5 == 0) { - --var8; - --var9; - } - - if (var5 == 1) { - --var9; - } - - if (var5 == 2) { - ++var8; - --var9; - } - - if (var5 == 3) { - --var8; - } - - if (var5 == 4) { - ++var8; - } - - if (var5 == 5) { - --var8; - ++var9; - } - - if (var5 == 6) { - ++var9; - } - - if (var5 == 7) { - ++var8; - ++var9; - } - - Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); - return false; - } else { - var3 = var0.readBits(18); - var4 = var3 >> 16; - var5 = var3 >> 8 & 255; - var11 = var3 & 255; - var7 = Players.Players_regions[var1]; - var8 = (var7 >> 28) + var4 & 3; - var9 = var5 + (var7 >> 14) & 255; - var10 = var11 + var7 & 255; - Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); - return false; - } - } - } - - @ObfuscatedName("hx") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-360381512" - ) - static final void method1746(int var0) { - int[] var1 = Interpreter.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) { - class2.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3); - } - - if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { - class2.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; - Interpreter.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) { - World.drawObject(var0, var6, var5, var3, var4); - } - - if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { - World.drawObject(var0 + 1, var6, var5, var3, var4); - } - } - } - - mapIconCount = 0; - - for (var5 = 0; var5 < 104; ++var5) { - for (var6 = 0; var6 < 104; ++var6) { - long var7 = class2.scene.getFloorDecorationTag(ClientPacket.Client_plane, var5, var6); - if (var7 != 0L) { - int var9 = ItemContainer.Entity_unpackID(var7); - int var10 = Occluder.getObjectDefinition(var9).mapIconId; - if (var10 >= 0) { - mapIcons[mapIconCount] = Varcs.WorldMapElement_get(var10).getSpriteBool(false); - mapIconXs[mapIconCount] = var5; - mapIconYs[mapIconCount] = var6; - ++mapIconCount; - } - } - } - } - - DirectByteArrayCopier.rasterProvider.apply(); + static int method1740(int var0) { + return (int)((Math.log((double)var0) / Interpreter.field1083 - 7.0D) * 256.0D); } } diff --git a/runescape-client/src/main/java/ClientPacket.java b/runescape-client/src/main/java/ClientPacket.java index 23a1ef2bf4..507341ac65 100644 --- a/runescape-client/src/main/java/ClientPacket.java +++ b/runescape-client/src/main/java/ClientPacket.java @@ -4,647 +4,640 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gj") +@ObfuscatedName("fh") @Implements("ClientPacket") -public class ClientPacket implements class181 { - @ObfuscatedName("qy") +public class ClientPacket implements class175 { + @ObfuscatedName("nf") @ObfuscatedSignature( - signature = "Lca;" + signature = "[Lha;" ) - @Export("pcmStreamMixer") - static PcmStreamMixer pcmStreamMixer; - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2322; + static Widget[] field2223; @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" ) - public static final ClientPacket field2218; - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2299; - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2220; - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2221; - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2222; - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2217; - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2271; - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2313; + public static final ClientPacket field2181; @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" ) - public static final ClientPacket field2226; - @ObfuscatedName("k") + public static final ClientPacket field2189; + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" ) - public static final ClientPacket field2303; - @ObfuscatedName("x") + public static final ClientPacket field2177; + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" ) - public static final ClientPacket field2228; - @ObfuscatedName("o") + public static final ClientPacket field2239; + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" ) - public static final ClientPacket field2229; + public static final ClientPacket field2179; + @ObfuscatedName("b") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2176; @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" ) - public static final ClientPacket field2315; - @ObfuscatedName("n") + public static final ClientPacket field2210; + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" ) - public static final ClientPacket field2231; - @ObfuscatedName("r") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2232; - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2237; + public static final ClientPacket field2175; @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" ) - public static final ClientPacket field2233; + public static final ClientPacket field2220; @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" ) - public static final ClientPacket field2235; - @ObfuscatedName("s") + public static final ClientPacket field2184; + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" ) - public static final ClientPacket field2224; - @ObfuscatedName("t") + public static final ClientPacket field2185; + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" ) - public static final ClientPacket field2275; - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2238; + static final ClientPacket field2252; @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" ) - public static final ClientPacket field2227; - @ObfuscatedName("q") + public static final ClientPacket field2187; + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" ) - public static final ClientPacket field2240; + public static final ClientPacket field2195; + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2233; @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" ) - public static final ClientPacket field2241; - @ObfuscatedName("j") + public static final ClientPacket field2190; + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2242; - @ObfuscatedName("af") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2243; - @ObfuscatedName("ad") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2276; - @ObfuscatedName("am") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2245; - @ObfuscatedName("ai") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2244; - @ObfuscatedName("ag") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2268; - @ObfuscatedName("ao") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2248; - @ObfuscatedName("aw") - @ObfuscatedSignature( - signature = "Lgj;" - ) - static final ClientPacket field2249; - @ObfuscatedName("ak") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2250; - @ObfuscatedName("aa") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2251; - @ObfuscatedName("ab") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2252; - @ObfuscatedName("ar") - @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" ) public static final ClientPacket field2253; + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2192; + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2193; + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2194; + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2178; + @ObfuscatedName("h") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2196; + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2186; + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "Lfh;" + ) + static final ClientPacket field2198; + @ObfuscatedName("r") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2215; + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2200; + @ObfuscatedName("aa") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2201; @ObfuscatedName("av") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" ) - public static final ClientPacket field2266; + public static final ClientPacket field2202; + @ObfuscatedName("aw") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2203; + @ObfuscatedName("as") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2219; + @ObfuscatedName("ak") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2205; + @ObfuscatedName("au") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2206; + @ObfuscatedName("ah") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2207; @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" ) - public static final ClientPacket field2255; - @ObfuscatedName("ac") + public static final ClientPacket field2208; + @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" ) - public static final ClientPacket field2236; + public static final ClientPacket field2209; + @ObfuscatedName("an") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2225; + @ObfuscatedName("ar") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2266; @ObfuscatedName("az") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" + ) + public static final ClientPacket field2264; + @ObfuscatedName("ay") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2213; + @ObfuscatedName("ag") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2214; + @ObfuscatedName("ac") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2204; + @ObfuscatedName("al") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2216; + @ObfuscatedName("ae") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2180; + @ObfuscatedName("ad") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2218; + @ObfuscatedName("aj") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2242; + @ObfuscatedName("ax") + @ObfuscatedSignature( + signature = "Lfh;" ) public static final ClientPacket field2257; @ObfuscatedName("at") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" ) - public static final ClientPacket field2258; - @ObfuscatedName("ae") + public static final ClientPacket field2221; + @ObfuscatedName("af") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" ) - public static final ClientPacket field2304; - @ObfuscatedName("aj") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2260; + public static final ClientPacket field2222; @ObfuscatedName("ap") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" ) - public static final ClientPacket field2261; - @ObfuscatedName("an") + public static final ClientPacket field2211; + @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" ) - public static final ClientPacket field2311; - @ObfuscatedName("al") + public static final ClientPacket field2224; + @ObfuscatedName("am") @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2263; - @ObfuscatedName("ay") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2223; - @ObfuscatedName("ax") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2292; - @ObfuscatedName("au") - @ObfuscatedSignature( - signature = "Lgj;" - ) - static final ClientPacket field2262; - @ObfuscatedName("as") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2267; - @ObfuscatedName("ah") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2264; - @ObfuscatedName("bi") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2293; - @ObfuscatedName("bo") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2270; - @ObfuscatedName("bx") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2273; - @ObfuscatedName("bu") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2259; - @ObfuscatedName("bd") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2316; - @ObfuscatedName("bn") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2274; - @ObfuscatedName("bj") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2256; - @ObfuscatedName("bm") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2247; - @ObfuscatedName("bq") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2277; - @ObfuscatedName("bf") - @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" ) public static final ClientPacket field2278; - @ObfuscatedName("by") + @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" ) - public static final ClientPacket field2279; - @ObfuscatedName("br") + public static final ClientPacket field2226; + @ObfuscatedName("bj") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" ) - static final ClientPacket field2280; - @ObfuscatedName("ba") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2281; - @ObfuscatedName("bb") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2282; + public static final ClientPacket field2227; @ObfuscatedName("bg") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" ) - public static final ClientPacket field2283; + public static final ClientPacket field2228; @ObfuscatedName("bw") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" ) - public static final ClientPacket field2284; - @ObfuscatedName("be") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2285; - @ObfuscatedName("bt") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2286; - @ObfuscatedName("bl") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2287; - @ObfuscatedName("bp") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2288; - @ObfuscatedName("bv") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2230; - @ObfuscatedName("bs") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2290; - @ObfuscatedName("bz") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2291; - @ObfuscatedName("bc") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2319; - @ObfuscatedName("bh") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2295; + public static final ClientPacket field2188; @ObfuscatedName("bk") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" ) - public static final ClientPacket field2294; - @ObfuscatedName("cm") + public static final ClientPacket field2230; + @ObfuscatedName("bl") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" + ) + public static final ClientPacket field2267; + @ObfuscatedName("bq") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2254; + @ObfuscatedName("bx") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2183; + @ObfuscatedName("bc") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2197; + @ObfuscatedName("by") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2235; + @ObfuscatedName("bz") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2236; + @ObfuscatedName("bm") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2237; + @ObfuscatedName("bo") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2238; + @ObfuscatedName("bs") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2231; + @ObfuscatedName("ba") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2279; + @ObfuscatedName("bn") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2241; + @ObfuscatedName("bb") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2199; + @ObfuscatedName("bh") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2182; + @ObfuscatedName("bv") + @ObfuscatedSignature( + signature = "Lfh;" + ) + static final ClientPacket field2244; + @ObfuscatedName("bu") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2245; + @ObfuscatedName("be") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2246; + @ObfuscatedName("bd") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2247; + @ObfuscatedName("bf") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2248; + @ObfuscatedName("bi") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2249; + @ObfuscatedName("br") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2250; + @ObfuscatedName("bt") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2251; + @ObfuscatedName("bp") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2229; + @ObfuscatedName("co") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2268; + @ObfuscatedName("cp") + @ObfuscatedSignature( + signature = "Lfh;" ) public static final ClientPacket field2265; @ObfuscatedName("cd") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" ) - public static final ClientPacket field2296; - @ObfuscatedName("cv") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2297; - @ObfuscatedName("cl") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2298; - @ObfuscatedName("cg") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2246; - @ObfuscatedName("ch") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2300; - @ObfuscatedName("co") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2301; - @ObfuscatedName("cr") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2302; - @ObfuscatedName("ck") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2234; - @ObfuscatedName("cb") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2269; - @ObfuscatedName("cy") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2305; - @ObfuscatedName("cn") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2225; + public static final ClientPacket field2255; @ObfuscatedName("cj") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" ) - public static final ClientPacket field2219; + public static final ClientPacket field2256; @ObfuscatedName("cq") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" ) - public static final ClientPacket field2308; - @ObfuscatedName("ci") + public static final ClientPacket field2240; + @ObfuscatedName("cb") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" ) - public static final ClientPacket field2309; - @ObfuscatedName("cu") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2310; - @ObfuscatedName("cs") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2289; - @ObfuscatedName("cc") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2317; - @ObfuscatedName("cp") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2312; - @ObfuscatedName("ce") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2314; - @ObfuscatedName("ca") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ClientPacket field2254; + public static final ClientPacket field2258; @ObfuscatedName("cf") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" ) - public static final ClientPacket field2306; + public static final ClientPacket field2259; + @ObfuscatedName("cs") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2217; + @ObfuscatedName("ch") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2261; + @ObfuscatedName("ca") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2262; + @ObfuscatedName("cn") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2263; @ObfuscatedName("cx") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" + ) + public static final ClientPacket field2212; + @ObfuscatedName("ck") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2273; + @ObfuscatedName("ce") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2232; + @ObfuscatedName("cu") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2234; + @ObfuscatedName("cg") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2191; + @ObfuscatedName("ct") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2269; + @ObfuscatedName("cr") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2270; + @ObfuscatedName("cy") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2271; + @ObfuscatedName("cz") + @ObfuscatedSignature( + signature = "Lfh;" ) public static final ClientPacket field2272; - @ObfuscatedName("db") + @ObfuscatedName("cm") @ObfuscatedSignature( - signature = "Lij;" + signature = "Lfh;" ) - @Export("archive7") - static Archive archive7; - @ObfuscatedName("jh") - @ObfuscatedGetter( - intValue = 222528841 + public static final ClientPacket field2243; + @ObfuscatedName("cl") + @ObfuscatedSignature( + signature = "Lfh;" ) - @Export("Client_plane") - static int Client_plane; - @ObfuscatedName("cz") + public static final ClientPacket field2260; + @ObfuscatedName("ci") + @ObfuscatedSignature( + signature = "Lfh;" + ) + public static final ClientPacket field2275; + @ObfuscatedName("dh") + @ObfuscatedSignature( + signature = "Lif;" + ) + @Export("archive0") + static Archive archive0; + @ObfuscatedName("cc") @ObfuscatedGetter( - intValue = 896326747 + intValue = -900434403 ) @Export("id") final int id; - @ObfuscatedName("ct") + @ObfuscatedName("cv") @ObfuscatedGetter( - intValue = 1444150799 + intValue = -1150168729 ) @Export("length") final int length; static { - field2322 = new ClientPacket(0, 13); - field2218 = new ClientPacket(1, 5); - field2299 = new ClientPacket(2, 8); - field2220 = new ClientPacket(3, 7); - field2221 = new ClientPacket(4, -1); - field2222 = new ClientPacket(5, 8); - field2217 = new ClientPacket(6, -1); - field2271 = new ClientPacket(7, 9); - field2313 = new ClientPacket(8, 8); - field2226 = new ClientPacket(9, 7); - field2303 = new ClientPacket(10, 8); - field2228 = new ClientPacket(11, 10); - field2229 = new ClientPacket(12, -2); - field2315 = new ClientPacket(13, 8); - field2231 = new ClientPacket(14, 3); - field2232 = new ClientPacket(15, 16); - field2237 = new ClientPacket(16, 7); - field2233 = new ClientPacket(17, 7); - field2235 = new ClientPacket(18, 8); - field2224 = new ClientPacket(19, 6); - field2275 = new ClientPacket(20, 6); - field2238 = new ClientPacket(21, 3); - field2227 = new ClientPacket(22, 7); - field2240 = new ClientPacket(23, 8); - field2241 = new ClientPacket(24, 3); - field2242 = new ClientPacket(25, 3); - field2243 = new ClientPacket(26, 3); - field2276 = new ClientPacket(27, 8); - field2245 = new ClientPacket(28, 3); - field2244 = new ClientPacket(29, 15); - field2268 = new ClientPacket(30, -1); - field2248 = new ClientPacket(31, 16); - field2249 = new ClientPacket(32, 2); - field2250 = new ClientPacket(33, 8); - field2251 = new ClientPacket(34, 3); - field2252 = new ClientPacket(35, 7); - field2253 = new ClientPacket(36, 8); - field2266 = new ClientPacket(37, -1); - field2255 = new ClientPacket(38, 3); - field2236 = new ClientPacket(39, 7); - field2257 = new ClientPacket(40, 3); - field2258 = new ClientPacket(41, 2); - field2304 = new ClientPacket(42, 2); - field2260 = new ClientPacket(43, 4); - field2261 = new ClientPacket(44, 3); - field2311 = new ClientPacket(45, 0); - field2263 = new ClientPacket(46, 13); - field2223 = new ClientPacket(47, 0); - field2292 = new ClientPacket(48, 7); - field2262 = new ClientPacket(49, -1); - field2267 = new ClientPacket(50, 3); - field2264 = new ClientPacket(51, 7); - field2293 = new ClientPacket(52, 2); - field2270 = new ClientPacket(53, 3); - field2273 = new ClientPacket(54, 8); - field2259 = new ClientPacket(55, 8); - field2316 = new ClientPacket(56, 11); - field2274 = new ClientPacket(57, 4); - field2256 = new ClientPacket(58, -1); - field2247 = new ClientPacket(59, 8); - field2277 = new ClientPacket(60, -1); - field2278 = new ClientPacket(61, 0); - field2279 = new ClientPacket(62, 8); - field2280 = new ClientPacket(63, 7); - field2281 = new ClientPacket(64, -2); - field2282 = new ClientPacket(65, -1); - field2283 = new ClientPacket(66, -1); - field2284 = new ClientPacket(67, 15); - field2285 = new ClientPacket(68, 9); - field2286 = new ClientPacket(69, 11); - field2287 = new ClientPacket(70, 8); - field2288 = new ClientPacket(71, 2); - field2230 = new ClientPacket(72, 4); - field2290 = new ClientPacket(73, -2); - field2291 = new ClientPacket(74, 4); - field2319 = new ClientPacket(75, -1); - field2295 = new ClientPacket(76, 4); - field2294 = new ClientPacket(77, 8); - field2265 = new ClientPacket(78, 3); - field2296 = new ClientPacket(79, -1); - field2297 = new ClientPacket(80, 7); - field2298 = new ClientPacket(81, 8); - field2246 = new ClientPacket(82, -1); - field2300 = new ClientPacket(83, 9); - field2301 = new ClientPacket(84, 16); - field2302 = new ClientPacket(85, -1); - field2234 = new ClientPacket(86, 0); - field2269 = new ClientPacket(87, 14); - field2305 = new ClientPacket(88, -1); - field2225 = new ClientPacket(89, 9); - field2219 = new ClientPacket(90, -1); - field2308 = new ClientPacket(91, 3); - field2309 = new ClientPacket(92, 1); - field2310 = new ClientPacket(93, 8); - field2289 = new ClientPacket(94, -1); - field2317 = new ClientPacket(95, 8); - field2312 = new ClientPacket(96, -1); - field2314 = new ClientPacket(97, -1); - field2254 = new ClientPacket(98, 13); - field2306 = new ClientPacket(99, 8); - field2272 = new ClientPacket(100, 0); + field2181 = new ClientPacket(0, 8); + field2189 = new ClientPacket(1, 7); + field2177 = new ClientPacket(2, -2); + field2239 = new ClientPacket(3, 11); + field2179 = new ClientPacket(4, 5); + field2176 = new ClientPacket(5, 0); + field2210 = new ClientPacket(6, 4); + field2175 = new ClientPacket(7, 3); + field2220 = new ClientPacket(8, 4); + field2184 = new ClientPacket(9, 2); + field2185 = new ClientPacket(10, 16); + field2252 = new ClientPacket(11, 2); + field2187 = new ClientPacket(12, -1); + field2195 = new ClientPacket(13, -1); + field2233 = new ClientPacket(14, 7); + field2190 = new ClientPacket(15, 8); + field2253 = new ClientPacket(16, 8); + field2192 = new ClientPacket(17, 4); + field2193 = new ClientPacket(18, 4); + field2194 = new ClientPacket(19, 2); + field2178 = new ClientPacket(20, 2); + field2196 = new ClientPacket(21, 8); + field2186 = new ClientPacket(22, 8); + field2198 = new ClientPacket(23, -1); + field2215 = new ClientPacket(24, 3); + field2200 = new ClientPacket(25, 8); + field2201 = new ClientPacket(26, 7); + field2202 = new ClientPacket(27, -2); + field2203 = new ClientPacket(28, 3); + field2219 = new ClientPacket(29, -1); + field2205 = new ClientPacket(30, 8); + field2206 = new ClientPacket(31, -1); + field2207 = new ClientPacket(32, 8); + field2208 = new ClientPacket(33, 3); + field2209 = new ClientPacket(34, 16); + field2225 = new ClientPacket(35, -1); + field2266 = new ClientPacket(36, 3); + field2264 = new ClientPacket(37, 7); + field2213 = new ClientPacket(38, 9); + field2214 = new ClientPacket(39, 3); + field2204 = new ClientPacket(40, 8); + field2216 = new ClientPacket(41, -1); + field2180 = new ClientPacket(42, 4); + field2218 = new ClientPacket(43, -2); + field2242 = new ClientPacket(44, 8); + field2257 = new ClientPacket(45, 15); + field2221 = new ClientPacket(46, -1); + field2222 = new ClientPacket(47, 3); + field2211 = new ClientPacket(48, 8); + field2224 = new ClientPacket(49, 3); + field2278 = new ClientPacket(50, -1); + field2226 = new ClientPacket(51, 0); + field2227 = new ClientPacket(52, 8); + field2228 = new ClientPacket(53, 15); + field2188 = new ClientPacket(54, -1); + field2230 = new ClientPacket(55, 7); + field2267 = new ClientPacket(56, 3); + field2254 = new ClientPacket(57, 8); + field2183 = new ClientPacket(58, 9); + field2197 = new ClientPacket(59, 8); + field2235 = new ClientPacket(60, 3); + field2236 = new ClientPacket(61, -1); + field2237 = new ClientPacket(62, 14); + field2238 = new ClientPacket(63, -1); + field2231 = new ClientPacket(64, 0); + field2279 = new ClientPacket(65, 8); + field2241 = new ClientPacket(66, 6); + field2199 = new ClientPacket(67, 13); + field2182 = new ClientPacket(68, 0); + field2244 = new ClientPacket(69, 7); + field2245 = new ClientPacket(70, -1); + field2246 = new ClientPacket(71, 6); + field2247 = new ClientPacket(72, 8); + field2248 = new ClientPacket(73, 7); + field2249 = new ClientPacket(74, -1); + field2250 = new ClientPacket(75, 3); + field2251 = new ClientPacket(76, 9); + field2229 = new ClientPacket(77, 1); + field2268 = new ClientPacket(78, 0); + field2265 = new ClientPacket(79, 7); + field2255 = new ClientPacket(80, 8); + field2256 = new ClientPacket(81, 3); + field2240 = new ClientPacket(82, 8); + field2258 = new ClientPacket(83, 7); + field2259 = new ClientPacket(84, -1); + field2217 = new ClientPacket(85, 9); + field2261 = new ClientPacket(86, 8); + field2262 = new ClientPacket(87, 8); + field2263 = new ClientPacket(88, 13); + field2212 = new ClientPacket(89, -1); + field2273 = new ClientPacket(90, 3); + field2232 = new ClientPacket(91, 13); + field2234 = new ClientPacket(92, 2); + field2191 = new ClientPacket(93, 10); + field2269 = new ClientPacket(94, 3); + field2270 = new ClientPacket(95, 11); + field2271 = new ClientPacket(96, -1); + field2272 = new ClientPacket(97, 7); + field2243 = new ClientPacket(98, 7); + field2260 = new ClientPacket(99, -1); + field2275 = new ClientPacket(100, 16); } ClientPacket(int var1, int var2) { @@ -652,735 +645,36 @@ public class ClientPacket implements class181 { this.length = var2; } - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Lky;Lky;Lky;I)V", - garbageValue = "-375424606" + signature = "(Lhz;Lhz;I)V", + garbageValue = "121922848" ) - @Export("drawTitle") - static void drawTitle(Font var0, Font var1, Font var2) { - Login.xPadding = (BoundaryObject.canvasWidth - 765) / 2; - Login.loginBoxX = Login.xPadding + 202; - GrandExchangeOfferOwnWorldComparator.loginBoxCenter = Login.loginBoxX + 180; - int var6; - int var9; - byte var23; - int var24; - int var26; - int var31; - int var38; - if (Login.worldSelectOpen) { - if (class42.worldSelectBackSprites == null) { - class42.worldSelectBackSprites = GraphicsDefaults.method5997(WorldMapRegion.archive8, "sl_back", ""); - } - - IndexedSprite[] var7; - Archive var30; - if (ItemContainer.worldSelectFlagSprites == null) { - var30 = WorldMapRegion.archive8; - var31 = var30.getGroupId("sl_flags"); - var6 = var30.getFileId(var31, ""); - if (!GraphicsObject.method2030(var30, var31, var6)) { - var7 = null; - } else { - var7 = WallDecoration.method3341(); - } - - ItemContainer.worldSelectFlagSprites = var7; - } - - if (class40.worldSelectArrows == null) { - var30 = WorldMapRegion.archive8; - var31 = var30.getGroupId("sl_arrows"); - var6 = var30.getFileId(var31, ""); - if (!GraphicsObject.method2030(var30, var31, var6)) { - var7 = null; - } else { - var7 = WallDecoration.method3341(); - } - - class40.worldSelectArrows = var7; - } - - if (GraphicsObject.worldSelectStars == null) { - var30 = WorldMapRegion.archive8; - var31 = var30.getGroupId("sl_stars"); - var6 = var30.getFileId(var31, ""); - if (!GraphicsObject.method2030(var30, var31, var6)) { - var7 = null; - } else { - var7 = WallDecoration.method3341(); - } - - GraphicsObject.worldSelectStars = var7; - } - - if (Skills.worldSelectLeftSprite == null) { - Skills.worldSelectLeftSprite = BZip2State.SpriteBuffer_getIndexedSpriteByName(WorldMapRegion.archive8, "leftarrow", ""); - } - - if (KitDefinition.worldSelectRightSprite == null) { - KitDefinition.worldSelectRightSprite = BZip2State.SpriteBuffer_getIndexedSpriteByName(WorldMapRegion.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 (GraphicsObject.worldSelectStars != null) { - GraphicsObject.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); - var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); - GraphicsObject.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); - var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); - } - - if (class40.worldSelectArrows != null) { - var38 = Login.xPadding + 280; - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { - class40.worldSelectArrows[2].drawAt(var38, 4); - } else { - class40.worldSelectArrows[0].drawAt(var38, 4); - } - - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { - class40.worldSelectArrows[3].drawAt(var38 + 15, 4); - } else { - class40.worldSelectArrows[1].drawAt(var38 + 15, 4); - } - - var0.draw("World", var38 + 32, 17, 16777215, -1); - var24 = Login.xPadding + 390; - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { - class40.worldSelectArrows[2].drawAt(var24, 4); - } else { - class40.worldSelectArrows[0].drawAt(var24, 4); - } - - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { - class40.worldSelectArrows[3].drawAt(var24 + 15, 4); - } else { - class40.worldSelectArrows[1].drawAt(var24 + 15, 4); - } - - var0.draw("Players", var24 + 32, 17, 16777215, -1); - var31 = Login.xPadding + 500; - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { - class40.worldSelectArrows[2].drawAt(var31, 4); - } else { - class40.worldSelectArrows[0].drawAt(var31, 4); - } - - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { - class40.worldSelectArrows[3].drawAt(var31 + 15, 4); - } else { - class40.worldSelectArrows[1].drawAt(var31 + 15, 4); - } - - var0.draw("Location", var31 + 32, 17, 16777215, -1); - var6 = Login.xPadding + 610; - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { - class40.worldSelectArrows[2].drawAt(var6, 4); - } else { - class40.worldSelectArrows[0].drawAt(var6, 4); - } - - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { - class40.worldSelectArrows[3].drawAt(var6 + 15, 4); - } else { - class40.worldSelectArrows[1].drawAt(var6 + 15, 4); - } - - var0.draw("Type", var6 + 32, 17, 16777215, -1); - } - - Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); - var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); - Login.hoveredWorldIndex = -1; - if (class42.worldSelectBackSprites != null) { - var23 = 88; - byte var42 = 19; - var31 = 765 / (var23 + 1) - 1; - var6 = 480 / (var42 + 1); - - int var34; - do { - var26 = var6; - var34 = var31; - if (var6 * (var31 - 1) >= World.World_count) { - --var31; - } - - if (var31 * (var6 - 1) >= World.World_count) { - --var6; - } - - if (var31 * (var6 - 1) >= World.World_count) { - --var6; - } - } while(var26 != var6 || var31 != var34); - - var26 = (765 - var23 * var31) / (var31 + 1); - if (var26 > 5) { - var26 = 5; - } - - var34 = (480 - var6 * var42) / (var6 + 1); - if (var34 > 5) { - var34 = 5; - } - - var9 = (765 - var23 * var31 - var26 * (var31 - 1)) / 2; - int var35 = (480 - var6 * var42 - var34 * (var6 - 1)) / 2; - int var11 = (var6 + World.World_count - 1) / var6; - Login.worldSelectPagesCount = var11 - var31; - if (Skills.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { - Skills.worldSelectLeftSprite.drawAt(8, WorldMapCacheName.canvasHeight / 2 - Skills.worldSelectLeftSprite.subHeight / 2); - } - - if (KitDefinition.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { - KitDefinition.worldSelectRightSprite.drawAt(BoundaryObject.canvasWidth - KitDefinition.worldSelectRightSprite.subWidth - 8, WorldMapCacheName.canvasHeight / 2 - KitDefinition.worldSelectRightSprite.subHeight / 2); - } - - int var12 = var35 + 23; - int var13 = var9 + Login.xPadding; - int var14 = 0; - boolean var15 = false; - int var16 = Login.worldSelectPage; - - int var17; - for (var17 = var16 * var6; var17 < World.World_count && var16 - Login.worldSelectPage < var31; ++var17) { - World var28 = Skills.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.method1788()) { - var21 = 8; - } 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 >= var13 && MouseHandler.MouseHandler_y >= var12 && MouseHandler.MouseHandler_x < var23 + var13 && MouseHandler.MouseHandler_y < var42 + var12 && var19) { - Login.hoveredWorldIndex = var17; - class42.worldSelectBackSprites[var21].drawTransOverlayAt(var13, var12, 128, 16777215); - var15 = true; - } else { - class42.worldSelectBackSprites[var21].drawAt(var13, var12); - } - - if (ItemContainer.worldSelectFlagSprites != null) { - ItemContainer.worldSelectFlagSprites[(var28.isMembersOnly() ? 8 : 0) + var28.location].drawAt(var13 + 29, var12); - } - - var0.drawCentered(Integer.toString(var28.id), var13 + 15, var42 / 2 + var12 + 5, var22, -1); - var1.drawCentered(var20, var13 + 60, var42 / 2 + var12 + 5, 268435455, -1); - var12 = var12 + var34 + var42; - ++var14; - if (var14 >= var6) { - var12 = var35 + 23; - var13 = var13 + var23 + var26; - var14 = 0; - ++var16; - } - } - - if (var15) { - var17 = var1.stringWidth(Skills.World_worlds[Login.hoveredWorldIndex].activity) + 6; - int var18 = var1.ascent + 8; - int var36 = MouseHandler.MouseHandler_y + 25; - if (var36 + var18 > 480) { - var36 = MouseHandler.MouseHandler_y - 25 - var18; - } - - Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var17 / 2, var36, var17, var18, 16777120); - Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var17 / 2, var36, var17, var18, 0); - var1.drawCentered(Skills.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var36 + var1.ascent + 4, 0, -1); - } - } - - DirectByteArrayCopier.rasterProvider.drawFull(0, 0); - } else { - AbstractByteArrayCopier.leftTitleSprite.drawAt(Login.xPadding, 0); - class319.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - Decimator.logoSprite.drawAt(Login.xPadding + 382 - Decimator.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 var27; - short var37; - short var39; - if (Client.gameState == 20) { - Login.titleboxSprite.drawAt(Login.loginBoxX + 180 - Login.titleboxSprite.subWidth / 2, 271 - Login.titleboxSprite.subHeight / 2); - var37 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var37, 16776960, 0); - var38 = var37 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var38, 16776960, 0); - var38 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var38, 16776960, 0); - var38 += 15; - var38 += 7; - if (Login.loginIndex != 4) { - var0.draw("Login: ", Login.loginBoxX + 180 - 110, var38, 16777215, 0); - var39 = 200; - - for (var25 = RouteStrategy.method3639(); var0.stringWidth(var25) > var39; var25 = var25.substring(0, var25.length() - 1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var25), Login.loginBoxX + 180 - 70, var38, 16777215, 0); - var38 += 15; - - for (var27 = PlayerType.method4212(Login.Login_password); var0.stringWidth(var27) > var39; var27 = var27.substring(1)) { - } - - var0.draw("Password: " + var27, Login.loginBoxX + 180 - 108, var38, 16777215, 0); - var38 += 15; - } - } - - if (Client.gameState == 10 || Client.gameState == 11) { - Login.titleboxSprite.drawAt(Login.loginBoxX, 171); - short var5; - if (Login.loginIndex == 0) { - var37 = 251; - var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var37, 16776960, 0); - var38 = var37 + 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); - var37 = 236; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var37, 16777215, 0); - var38 = var37 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var38, 16777215, 0); - var38 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var38, 16777215, 0); - var38 += 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) { - var37 = 201; - var0.drawCentered(Login.Login_response1, GrandExchangeOfferOwnWorldComparator.loginBoxCenter, var37, 16776960, 0); - var38 = var37 + 15; - var0.drawCentered(Login.Login_response2, GrandExchangeOfferOwnWorldComparator.loginBoxCenter, var38, 16776960, 0); - var38 += 15; - var0.drawCentered(Login.Login_response3, GrandExchangeOfferOwnWorldComparator.loginBoxCenter, var38, 16776960, 0); - var38 += 15; - var38 += 7; - var0.draw("Login: ", GrandExchangeOfferOwnWorldComparator.loginBoxCenter - 110, var38, 16777215, 0); - var39 = 200; - - for (var25 = RouteStrategy.method3639(); var0.stringWidth(var25) > var39; var25 = var25.substring(1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var25) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? class222.colorStartTag(16776960) + "|" : ""), GrandExchangeOfferOwnWorldComparator.loginBoxCenter - 70, var38, 16777215, 0); - var38 += 15; - - for (var27 = PlayerType.method4212(Login.Login_password); var0.stringWidth(var27) > var39; var27 = var27.substring(1)) { - } - - var0.draw("Password: " + var27 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? class222.colorStartTag(16776960) + "|" : ""), GrandExchangeOfferOwnWorldComparator.loginBoxCenter - 108, var38, 16777215, 0); - var38 += 15; - var37 = 277; - var26 = GrandExchangeOfferOwnWorldComparator.loginBoxCenter + -117; - IndexedSprite var29 = PendingSpawn.method1753(Client.Login_isUsernameRemembered, Login.field1173); - var29.drawAt(var26, var37); - var26 = var26 + var29.subWidth + 5; - var1.draw("Remember username", var26, var37 + 13, 16776960, 0); - var26 = GrandExchangeOfferOwnWorldComparator.loginBoxCenter + 24; - var29 = PendingSpawn.method1753(UserComparator10.clientPreferences.hideUsername, Login.field1195); - var29.drawAt(var26, var37); - var26 = var26 + var29.subWidth + 5; - var1.draw("Hide username", var26, var37 + 13, 16776960, 0); - var38 = var37 + 15; - var9 = GrandExchangeOfferOwnWorldComparator.loginBoxCenter - 80; - short var10 = 321; - Login.titlebuttonSprite.drawAt(var9 - 73, var10 - 20); - var0.drawCentered("Login", var9, var10 + 5, 16777215, 0); - var9 = GrandExchangeOfferOwnWorldComparator.loginBoxCenter + 80; - Login.titlebuttonSprite.drawAt(var9 - 73, var10 - 20); - var0.drawCentered("Cancel", var9, var10 + 5, 16777215, 0); - var37 = 357; - switch(Login.field1186) { - case 2: - ClientPreferences.field1052 = "Having trouble logging in?"; - break; - default: - ClientPreferences.field1052 = "Can't login? Click here."; - } - - GrandExchangeOfferOwnWorldComparator.field638 = new Bounds(GrandExchangeOfferOwnWorldComparator.loginBoxCenter, var37, var1.stringWidth(ClientPreferences.field1052), 11); - class186.field2342 = new Bounds(GrandExchangeOfferOwnWorldComparator.loginBoxCenter, var37, var1.stringWidth("Still having trouble logging in?"), 11); - var1.drawCentered(ClientPreferences.field1052, GrandExchangeOfferOwnWorldComparator.loginBoxCenter, var37, 16777215, 0); - } else if (Login.loginIndex == 3) { - var37 = 201; - var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var37, 16776960, 0); - var38 = var37 + 20; - var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var38, 16776960, 0); - var38 += 15; - var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var38, 16776960, 0); - var38 += 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); - var37 = 236; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var37, 16777215, 0); - var38 = var37 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var38, 16777215, 0); - var38 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var38, 16777215, 0); - var38 += 15; - var0.draw("PIN: " + PlayerType.method4212(WorldMapSection0.otp) + (Client.cycle % 40 < 20 ? class222.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var38, 16777215, 0); - var38 -= 8; - var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var38, 16776960, 0); - var38 += 15; - var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var38, 16776960, 0); - var24 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; - var31 = var38 - var0.ascent; - IndexedSprite var41; - if (Login.field1196) { - var41 = Varps.options_buttons_2Sprite; - } else { - var41 = InterfaceParent.options_buttons_0Sprite; - } - - var41.drawAt(var24, var31); - var38 += 15; - var26 = Login.loginBoxX + 180 - 80; - var8 = 321; - Login.titlebuttonSprite.drawAt(var26 - 73, var8 - 20); - var0.drawCentered("Continue", var26, var8 + 5, 16777215, 0); - var26 = Login.loginBoxX + 180 + 80; - Login.titlebuttonSprite.drawAt(var26 - 73, var8 - 20); - var0.drawCentered("Cancel", var26, var8 + 5, 16777215, 0); - var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var8 + 36, 255, 0); - } else if (Login.loginIndex == 5) { - var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); - var37 = 221; - var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var37, 16776960, 0); - var38 = var37 + 15; - var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var38, 16776960, 0); - var38 += 15; - var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var38, 16776960, 0); - var38 += 15; - var38 += 14; - var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var38, 16777215, 0); - var39 = 174; - - for (var25 = RouteStrategy.method3639(); var0.stringWidth(var25) > var39; var25 = var25.substring(1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var25) + (Client.cycle % 40 < 20 ? class222.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var38, 16777215, 0); - var38 += 15; - var6 = Login.loginBoxX + 180 - 80; - short var40 = 321; - Login.titlebuttonSprite.drawAt(var6 - 73, var40 - 20); - var0.drawCentered("Recover", var6, var40 + 5, 16777215, 0); - var6 = Login.loginBoxX + 180 + 80; - Login.titlebuttonSprite.drawAt(var6 - 73, var40 - 20); - var0.drawCentered("Back", var6, var40 + 5, 16777215, 0); - var40 = 356; - var1.drawCentered("Still having trouble logging in?", GrandExchangeOfferOwnWorldComparator.loginBoxCenter, var40, 268435455, 0); - } else if (Login.loginIndex == 6) { - var37 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var37, 16776960, 0); - var38 = var37 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var38, 16776960, 0); - var38 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var38, 16776960, 0); - var38 += 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) { - var37 = 216; - var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var37, 16776960, 0); - var38 = var37 + 15; - var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var38, 16776960, 0); - var38 += 15; - var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var38, 16776960, 0); - var38 += 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) { - var37 = 216; - var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var37, 16776960, 0); - var38 = var37 + 15; - var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var38, 16776960, 0); - var38 += 15; - var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var38, 16776960, 0); - var38 += 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) { - var37 = 201; - String var4 = ""; - var25 = ""; - var27 = ""; - switch(Login.field1185) { - case 0: - var4 = "Your account has been disabled."; - var25 = Strings.field2823; - var27 = ""; - break; - case 1: - var4 = "Account locked as we suspect it has been stolen."; - var25 = Strings.field2862; - var27 = ""; - break; - default: - class222.Login_promptCredentials(false); - } - - var0.drawCentered(var4, Login.loginBoxX + 180, var37, 16776960, 0); - var38 = var37 + 15; - var2.drawCentered(var25, Login.loginBoxX + 180, var38, 16776960, 0); - var38 += 15; - var2.drawCentered(var27, Login.loginBoxX + 180, var38, 16776960, 0); - var38 += 15; - var26 = Login.loginBoxX + 180; - var8 = 276; - Login.titlebuttonSprite.drawAt(var26 - 73, var8 - 20); - var0.drawCentered("Support Page", var26, var8 + 5, 16777215, 0); - var26 = Login.loginBoxX + 180; - var8 = 326; - Login.titlebuttonSprite.drawAt(var26 - 73, var8 - 20); - var0.drawCentered("Back", var26, var8 + 5, 16777215, 0); - } else if (Login.loginIndex == 24) { - var37 = 221; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var37, 16777215, 0); - var38 = var37 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var38, 16777215, 0); - var38 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var38, 16777215, 0); - var38 += 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, WorldMapCacheName.canvasHeight); - DynamicObject.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); - DynamicObject.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); - Rasterizer2D.Rasterizer2D_setClipArray(var3); - } - - Login.title_muteSprite[UserComparator10.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); - if (Client.gameState > 5 && VarbitDefinition.clientLanguage == Language.Language_EN) { - if (class42.field364 != null) { - var38 = Login.xPadding + 5; - var39 = 463; - byte var33 = 100; - byte var32 = 35; - class42.field364.drawAt(var38, var39); - var0.drawCentered("World" + " " + Client.worldId, var33 / 2 + var38, var32 / 2 + var39 - 2, 16777215, 0); - if (GrandExchangeOfferOwnWorldComparator.World_request != null) { - var1.drawCentered("Loading...", var33 / 2 + var38, var32 / 2 + var39 + 12, 16777215, 0); - } else { - var1.drawCentered("Click to switch", var33 / 2 + var38, var32 / 2 + var39 + 12, 16777215, 0); - } - } else { - class42.field364 = BZip2State.SpriteBuffer_getIndexedSpriteByName(WorldMapRegion.archive8, "sl_button", ""); - } - } - - } + public static void method3570(AbstractArchive var0, AbstractArchive var1) { + SpotAnimationDefinition.SpotAnimationDefinition_archive = var0; + SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var1; } - @ObfuscatedName("gl") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-850052471" + signature = "(IB)Lil;", + garbageValue = "-81" ) - static final int method3660() { - if (UserComparator10.clientPreferences.roofsHidden) { - return Client_plane; + @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 { - int var0 = 3; - if (ItemContainer.cameraPitch < 310) { - int var1; - int var2; - if (Client.oculusOrbState == 1) { - var1 = class80.oculusOrbFocalPointX >> 7; - var2 = class81.oculusOrbFocalPointY >> 7; - } else { - var1 = class215.localPlayer.x >> 7; - var2 = class215.localPlayer.y >> 7; - } - - int var3 = class30.cameraX >> 7; - int var4 = FloorDecoration.cameraZ >> 7; - if (var3 < 0 || var4 < 0 || var3 >= 104 || var4 >= 104) { - return Client_plane; - } - - if (var1 < 0 || var2 < 0 || var1 >= 104 || var2 >= 104) { - return Client_plane; - } - - if ((Tiles.Tiles_renderFlags[Client_plane][var3][var4] & 4) != 0) { - var0 = Client_plane; - } - - int var5; - if (var1 > var3) { - var5 = var1 - var3; - } else { - var5 = var3 - var1; - } - - int var6; - if (var2 > var4) { - var6 = var2 - var4; - } else { - var6 = var4 - var2; - } - - int var7; - int var8; - if (var5 > var6) { - var7 = var6 * 65536 / var5; - var8 = 32768; - - while (var3 != var1) { - if (var3 < var1) { - ++var3; - } else if (var3 > var1) { - --var3; - } - - if ((Tiles.Tiles_renderFlags[Client_plane][var3][var4] & 4) != 0) { - var0 = Client_plane; - } - - var8 += var7; - if (var8 >= 65536) { - var8 -= 65536; - if (var4 < var2) { - ++var4; - } else if (var4 > var2) { - --var4; - } - - if ((Tiles.Tiles_renderFlags[Client_plane][var3][var4] & 4) != 0) { - var0 = Client_plane; - } - } - } - } else if (var6 > 0) { - var7 = var5 * 65536 / var6; - var8 = 32768; - - while (var4 != var2) { - if (var4 < var2) { - ++var4; - } else if (var4 > var2) { - --var4; - } - - if ((Tiles.Tiles_renderFlags[Client_plane][var3][var4] & 4) != 0) { - var0 = Client_plane; - } - - var8 += var7; - if (var8 >= 65536) { - var8 -= 65536; - if (var3 < var1) { - ++var3; - } else if (var3 > var1) { - --var3; - } - - if ((Tiles.Tiles_renderFlags[Client_plane][var3][var4] & 4) != 0) { - var0 = Client_plane; - } - } - } - } + byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); + var1 = new SpotAnimationDefinition(); + var1.id = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); } - if (class215.localPlayer.x >= 0 && class215.localPlayer.y >= 0 && class215.localPlayer.x < 13312 && class215.localPlayer.y < 13312) { - if ((Tiles.Tiles_renderFlags[Client_plane][class215.localPlayer.x >> 7][class215.localPlayer.y >> 7] & 4) != 0) { - var0 = Client_plane; - } - - return var0; - } else { - return Client_plane; - } + SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); + return var1; } } } diff --git a/runescape-client/src/main/java/ClientPreferences.java b/runescape-client/src/main/java/ClientPreferences.java index cd9bd681fc..e484067ea8 100644 --- a/runescape-client/src/main/java/ClientPreferences.java +++ b/runescape-client/src/main/java/ClientPreferences.java @@ -7,36 +7,46 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bs") +@ObfuscatedName("bf") @Implements("ClientPreferences") public class ClientPreferences { - @ObfuscatedName("u") + @ObfuscatedName("qu") + @ObfuscatedSignature( + signature = "Ldr;" + ) + @Export("decimator") + static Decimator decimator; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1145191991 + intValue = 1642477041 ) @Export("ClientPreferences_optionCount") static int ClientPreferences_optionCount; - @ObfuscatedName("ak") - static String field1052; - @ObfuscatedName("b") + @ObfuscatedName("jz") + @ObfuscatedSignature( + signature = "Lha;" + ) + @Export("dragInventoryWidget") + static Widget dragInventoryWidget; + @ObfuscatedName("y") @Export("roofsHidden") boolean roofsHidden; - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("titleMusicDisabled") boolean titleMusicDisabled; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1051174515 + intValue = -732780625 ) @Export("windowMode") int windowMode; - @ObfuscatedName("p") + @ObfuscatedName("b") @Export("rememberedUsername") String rememberedUsername; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("hideUsername") boolean hideUsername; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("parameters") LinkedHashMap parameters; @@ -49,11 +59,11 @@ public class ClientPreferences { this.rememberedUsername = null; this.hideUsername = false; this.parameters = new LinkedHashMap(); - this.method1856(true); + this.method1835(true); } @ObfuscatedSignature( - signature = "(Lkg;)V" + signature = "(Lkq;)V" ) ClientPreferences(Buffer var1) { this.windowMode = 1; @@ -93,26 +103,26 @@ public class ClientPreferences { this.hideUsername = var1.readBoolean(); } } else { - this.method1856(true); + this.method1835(true); } } else { - this.method1856(true); + this.method1835(true); } } - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "1503707935" - ) - void method1856(boolean var1) { - } - @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(I)Lkg;", - garbageValue = "-650033927" + signature = "(ZS)V", + garbageValue = "-15246" + ) + void method1835(boolean var1) { + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(I)Lkq;", + garbageValue = "458366092" ) @Export("toBuffer") Buffer toBuffer() { @@ -134,51 +144,4 @@ public class ClientPreferences { var1.writeBoolean(this.hideUsername); return var1; } - - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "(Lij;IIIBZI)V", - garbageValue = "-4346330" - ) - @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; - } - - } - } - } - } } diff --git a/runescape-client/src/main/java/Clock.java b/runescape-client/src/main/java/Clock.java index fa3a147361..17715352fd 100644 --- a/runescape-client/src/main/java/Clock.java +++ b/runescape-client/src/main/java/Clock.java @@ -3,161 +3,57 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fp") +@ObfuscatedName("fc") @Implements("Clock") public abstract class Clock { Clock() { } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-26166053" + signature = "(B)V", + garbageValue = "4" ) @Export("mark") public abstract void mark(); - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "6" + signature = "(III)I", + garbageValue = "670539248" ) @Export("wait") public abstract int wait(int var1, int var2); - @ObfuscatedName("b") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "([Lbp;II[I[II)V", - garbageValue = "-767358668" + signature = "(III)I", + garbageValue = "90199453" ) - @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; + static int method3489(int var0, int var1) { + long var2 = (long)((var0 << 16) + var1); + return PrivateChatMode.NetCache_currentResponse != null && PrivateChatMode.NetCache_currentResponse.key == var2 ? NetCache.NetCache_responseArchiveBuffer.offset * 99 / (NetCache.NetCache_responseArchiveBuffer.array.length - PrivateChatMode.NetCache_currentResponse.padding) + 1 : 0; + } - while (var5 < var6) { - boolean var9 = true; + @ObfuscatedName("kk") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "1974720745" + ) + static final void method3488() { + PacketBufferNode var0 = class2.getPacketBufferNode(ClientPacket.field2231, Client.packetWriter.isaacCipher); + Client.packetWriter.addNode(var0); - 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; - } + 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); } + } - sortWorlds(var0, var1, var6, var3, var4); - sortWorlds(var0, var6 + 1, var2, var3, var4); + if (Client.meslayerContinueWidget != null) { + LoginPacket.invalidateWidget(Client.meslayerContinueWidget); + Client.meslayerContinueWidget = null; } } - - @ObfuscatedName("ex") - @ObfuscatedSignature( - signature = "(I)Llo;", - garbageValue = "-40760681" - ) - @Export("getWorldMap") - static WorldMap getWorldMap() { - return WorldMapRegion.worldMap; - } - - @ObfuscatedName("kc") - @ObfuscatedSignature( - signature = "(IIIZI)V", - garbageValue = "744755226" - ) - public static void method3555(int var0, int var1, int var2, boolean var3) { - PacketBufferNode var4 = ModelData0.getPacketBufferNode(ClientPacket.field2285, Client.packetWriter.isaacCipher); - var4.packetBuffer.writeIntME(var2); - var4.packetBuffer.writeShortLE(var1); - var4.packetBuffer.method5648(var3 ? Client.field748 : 0); - var4.packetBuffer.writeShortLE(var0); - Client.packetWriter.addNode(var4); - } } diff --git a/runescape-client/src/main/java/CollisionMap.java b/runescape-client/src/main/java/CollisionMap.java index ec63850cc8..f78b7e5037 100644 --- a/runescape-client/src/main/java/CollisionMap.java +++ b/runescape-client/src/main/java/CollisionMap.java @@ -1,42 +1,43 @@ +import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fh") +@ObfuscatedName("fp") @Implements("CollisionMap") public class CollisionMap { - @ObfuscatedName("ff") + @ObfuscatedName("d") + public static short[][] field2066; + @ObfuscatedName("ev") + @Export("worldHost") + static String worldHost; + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -580865105 - ) - static int field2086; - @ObfuscatedName("ak") - @ObfuscatedGetter( - intValue = -1403306953 + intValue = -733536729 ) @Export("xInset") - int xInset; - @ObfuscatedName("aa") + public int xInset; + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -111839057 + intValue = -572637509 ) @Export("yInset") - int yInset; - @ObfuscatedName("ab") + public int yInset; + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = 1867472401 + intValue = 1390386939 ) @Export("xSize") int xSize; @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 1884371115 + intValue = -1658785195 ) @Export("ySize") int ySize; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("flags") public int[][] flags; @@ -49,10 +50,10 @@ public class CollisionMap { this.clear(); } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "621832318" + garbageValue = "-734218208" ) @Export("clear") public void clear() { @@ -68,12 +69,12 @@ public class CollisionMap { } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(IIIIZB)V", - garbageValue = "61" + garbageValue = "1" ) - public void method3614(int var1, int var2, int var3, int var4, boolean var5) { + public void method3552(int var1, int var2, int var3, int var4, boolean var5) { var1 -= this.xInset; var2 -= this.yInset; if (var3 == 0) { @@ -220,10 +221,10 @@ public class CollisionMap { } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(IIIIZB)V", - garbageValue = "6" + signature = "(IIIIZI)V", + garbageValue = "-629817472" ) @Export("addGameObject") public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) { @@ -247,10 +248,10 @@ public class CollisionMap { } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "0" + signature = "(III)V", + garbageValue = "-1485831416" ) @Export("setBlockedByFloor") public void setBlockedByFloor(int var1, int var2) { @@ -260,10 +261,10 @@ public class CollisionMap { var10000[var2] |= 2097152; } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "-82" + signature = "(III)V", + garbageValue = "1736221922" ) @Export("setBlockedByFloorDec") public void setBlockedByFloorDec(int var1, int var2) { @@ -273,10 +274,10 @@ public class CollisionMap { var10000[var2] |= 262144; } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( signature = "(IIII)V", - garbageValue = "-144108327" + garbageValue = "677755057" ) @Export("setFlag") void setFlag(int var1, int var2, int var3) { @@ -284,12 +285,12 @@ public class CollisionMap { var10000[var2] |= var3; } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(IIIIZI)V", - garbageValue = "350468397" + signature = "(IIIIZB)V", + garbageValue = "-90" ) - public void method3598(int var1, int var2, int var3, int var4, boolean var5) { + public void method3534(int var1, int var2, int var3, int var4, boolean var5) { var1 -= this.xInset; var2 -= this.yInset; if (var3 == 0) { @@ -436,10 +437,10 @@ public class CollisionMap { } - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(IIIIIZI)V", - garbageValue = "-1764798116" + garbageValue = "1274501460" ) @Export("setFlagOffNonSquare") public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5, boolean var6) { @@ -469,10 +470,10 @@ public class CollisionMap { } - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(IIII)V", - garbageValue = "-1534832380" + signature = "(IIIB)V", + garbageValue = "114" ) @Export("setFlagOff") void setFlagOff(int var1, int var2, int var3) { @@ -480,73 +481,102 @@ public class CollisionMap { var10000[var2] &= ~var3; } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "1031605578" + garbageValue = "55211859" ) - public void method3601(int var1, int var2) { + public void method3535(int var1, int var2) { var1 -= this.xInset; var2 -= this.yInset; int[] var10000 = this.flags[var1]; var10000[var2] &= -262145; } - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "([Lgy;II)Lgy;", - garbageValue = "-356918192" - ) - @Export("findEnumerated") - public static Enumerated findEnumerated(Enumerated[] var0, int var1) { - Enumerated[] var2 = var0; - - for (int var3 = 0; var3 < var2.length; ++var3) { - Enumerated var4 = var2[var3]; - if (var1 == var4.rsOrdinal()) { - return var4; - } - } - - return null; - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(Lhf;Lhf;I)V", - garbageValue = "1646323129" - ) - public static void method3615(AbstractArchive var0, AbstractArchive var1) { - class14.KitDefinition_archive = var0; - KitDefinition.KitDefinition_modelsArchive = var1; - KitDefinition.KitDefinition_fileCount = class14.KitDefinition_archive.getGroupFileCount(3); - } - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-1773174519" - ) - @Export("Messages_getLastChatID") - static int Messages_getLastChatID(int var0) { - Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); - if (var1 == null) { - return -1; + @Export("base37DecodeLong") + public static String base37DecodeLong(long var0) { + if (var0 > 0L && var0 < 6582952005840035281L) { + if (var0 % 37L == 0L) { + return null; + } else { + int var2 = 0; + + for (long var3 = var0; var3 != 0L; var3 /= 37L) { + ++var2; + } + + StringBuilder var5; + char var8; + for (var5 = new StringBuilder(var2); 0L != var0; var5.append(var8)) { + long var6 = var0; + var0 /= 37L; + var8 = class288.base37Table[(int)(var6 - 37L * var0)]; + if (var8 == '_') { + int var9 = var5.length() - 1; + var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); + var8 = 160; + } + } + + var5.reverse(); + var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); + return var5.toString(); + } } else { - return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; + return null; } } - @ObfuscatedName("w") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "746775715" + signature = "(IS)I", + garbageValue = "1536" ) - public static final void method3628(int var0, int var1) { - ViewportMouse.ViewportMouse_x = var0; - ViewportMouse.ViewportMouse_y = var1; - ViewportMouse.ViewportMouse_isInViewport = true; - ViewportMouse.ViewportMouse_entityCount = 0; - ViewportMouse.ViewportMouse_false0 = false; + public static int method3555(int var0) { + return class268.method5012(ViewportMouse.ViewportMouse_entityTags[var0]); + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + signature = "(IIII)I", + garbageValue = "-1858221764" + ) + static final int method3530(int var0, int var1, int var2) { + int var3 = var0 / var2; + int var4 = var0 & var2 - 1; + int var5 = var1 / var2; + int var6 = var1 & var2 - 1; + int var7 = class32.method551(var3, var5); + int var8 = class32.method551(var3 + 1, var5); + int var9 = class32.method551(var3, var5 + 1); + int var10 = class32.method551(var3 + 1, var5 + 1); + int var11 = class13.method150(var7, var8, var4, var2); + int var12 = class13.method150(var9, var10, var4, var2); + return class13.method150(var11, var12, var6, var2); + } + + @ObfuscatedName("hs") + @ObfuscatedSignature( + signature = "(ZI)V", + garbageValue = "1164715285" + ) + static final void method3557(boolean var0) { + WorldMapLabel.playPcmPlayers(); + ++Client.packetWriter.pendingWrites; + if (Client.packetWriter.pendingWrites >= 50 || var0) { + Client.packetWriter.pendingWrites = 0; + if (!Client.field677 && Client.packetWriter.getSocket() != null) { + PacketBufferNode var1 = class2.getPacketBufferNode(ClientPacket.field2182, Client.packetWriter.isaacCipher); + Client.packetWriter.addNode(var1); + + try { + Client.packetWriter.flush(); + } catch (IOException var3) { + Client.field677 = true; + } + } + + } } } diff --git a/runescape-client/src/main/java/Coord.java b/runescape-client/src/main/java/Coord.java index 5779d09c80..eb803d8a01 100644 --- a/runescape-client/src/main/java/Coord.java +++ b/runescape-client/src/main/java/Coord.java @@ -4,36 +4,36 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hx") +@ObfuscatedName("ht") @Implements("Coord") public class Coord { - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 556251855 + @ObfuscatedName("b") + @ObfuscatedSignature( + signature = "Lhz;" ) - @Export("graphicsTickTimeIdx") - static int graphicsTickTimeIdx; - @ObfuscatedName("u") + @Export("musicTrackArchive") + public static AbstractArchive musicTrackArchive; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1348059781 + intValue = 84466269 ) @Export("plane") public int plane; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1294830225 + intValue = 468184679 ) @Export("x") public int x; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 358494981 + intValue = -387366221 ) @Export("y") public int y; @ObfuscatedSignature( - signature = "(Lhx;)V" + signature = "(Lht;)V" ) public Coord(Coord var1) { this.plane = var1.plane; @@ -58,20 +58,20 @@ public class Coord { } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-633329475" + signature = "(B)I", + garbageValue = "-72" ) @Export("packed") public int packed() { return this.plane << 28 | this.x << 14 | this.y; } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lhx;I)Z", - garbageValue = "1606698981" + signature = "(Lht;I)Z", + garbageValue = "1703593953" ) @Export("equalsCoord") boolean equalsCoord(Coord var1) { @@ -84,16 +84,24 @@ public class Coord { } } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "(Ljava/lang/String;B)Ljava/lang/String;", - garbageValue = "-38" + garbageValue = "32" ) @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; @@ -102,11 +110,32 @@ public class Coord { } } - public int hashCode() { - return this.packed(); - } + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "(IB)Lig;", + garbageValue = "1" + ) + @Export("getObjectDefinition") + public static ObjectDefinition getObjectDefinition(int var0) { + ObjectDefinition var1 = (ObjectDefinition)ObjectDefinition.ObjectDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = ObjectDefinition.ObjectDefinition_archive.takeFile(6, var0); + var1 = new ObjectDefinition(); + var1.id = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); + } - public String toString() { - return this.toString(","); + var1.postDecode(); + if (var1.isSolid) { + var1.interactType = 0; + var1.boolean1 = false; + } + + ObjectDefinition.ObjectDefinition_cached.put(var1, (long)var0); + return var1; + } } } diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java index 23578ec9b2..3b2eecd2c6 100644 --- a/runescape-client/src/main/java/Decimator.java +++ b/runescape-client/src/main/java/Decimator.java @@ -3,97 +3,72 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("dn") +@ObfuscatedName("dr") @Implements("Decimator") public class Decimator { @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Llm;" - ) - @Export("logoSprite") - static IndexedSprite logoSprite; - @ObfuscatedName("hh") @ObfuscatedGetter( - intValue = -1979391885 - ) - @Export("cameraYaw") - static int cameraYaw; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 169220929 + intValue = -2103215085 ) @Export("inputRate") int inputRate; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1367353289 + intValue = 643968559 ) @Export("outputRate") int outputRate; - @ObfuscatedName("p") + @ObfuscatedName("b") @Export("table") int[][] table; public Decimator(int var1, int var2) { if (var2 != var1) { - int var4 = var1; - int var5 = var2; - if (var2 > var1) { - var4 = var2; - var5 = var1; - } - - while (var5 != 0) { - int var6 = var4 % var5; - var4 = var5; - var5 = var6; - } - - var1 /= var4; - var2 /= var4; + int var3 = class179.method3580(var1, var2); + var1 /= var3; + var2 /= var3; this.inputRate = var1; this.outputRate = var2; this.table = new int[var1][14]; - for (int var7 = 0; var7 < var1; ++var7) { - int[] var8 = this.table[var7]; - double var9 = (double)var7 / (double)var1 + 6.0D; - int var11 = (int)Math.floor(var9 - 7.0D + 1.0D); - if (var11 < 0) { - var11 = 0; + 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; } - int var12 = (int)Math.ceil(var9 + 7.0D); - if (var12 > 14) { - var12 = 14; + int var9 = (int)Math.ceil(7.0D + var6); + if (var9 > 14) { + var9 = 14; } - for (double var13 = (double)var2 / (double)var1; var11 < var12; ++var11) { - double var15 = 3.141592653589793D * ((double)var11 - var9); - double var17 = var13; - if (var15 < -1.0E-4D || var15 > 1.0E-4D) { - var17 = var13 * (Math.sin(var15) / var15); + 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); } - var17 *= 0.54D + 0.46D * Math.cos(((double)var11 - var9) * 0.2243994752564138D); - var8[var11] = (int)Math.floor(65536.0D * var17 + 0.5D); + var14 *= 0.54D + 0.46D * Math.cos(0.2243994752564138D * ((double)var8 - var6)); + var5[var8] = (int)Math.floor(var14 * 65536.0D + 0.5D); } } } } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "([BI)[B", - garbageValue = "-1845568783" + garbageValue = "-1964001548" ) @Export("resample") byte[] resample(byte[] var1) { if (this.table != null) { - int var2 = (int)((long)this.outputRate * (long)var1.length / (long)this.inputRate) + 14; + int var2 = (int)((long)var1.length * (long)this.outputRate / (long)this.inputRate) + 14; int[] var3 = new int[var2]; int var4 = 0; int var5 = 0; @@ -105,7 +80,7 @@ public class Decimator { int var9; for (var9 = 0; var9 < 14; ++var9) { - var3[var4 + var9] += var8[var9] * var7; + var3[var9 + var4] += var8[var9] * var7; } var5 += this.outputRate; @@ -131,57 +106,31 @@ public class Decimator { return var1; } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(II)I", - garbageValue = "1828348822" + garbageValue = "-1093845583" ) @Export("scaleRate") int scaleRate(int var1) { if (this.table != null) { - var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate); + var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate); } return var1; } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "(II)I", - garbageValue = "-925934558" + garbageValue = "1063686920" ) @Export("scalePosition") int scalePosition(int var1) { if (this.table != null) { - var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate) + 6; + var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate) + 6; } return var1; } - - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "(ILci;ZI)I", - garbageValue = "1172796739" - ) - static int method2564(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? Interpreter.field1090 : class188.field2352; - if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.itemId; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { - if (var3.itemId != -1) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.itemQuantity; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_GETID) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.childIndex; - return 1; - } else { - return 2; - } - } } diff --git a/runescape-client/src/main/java/DefaultsGroup.java b/runescape-client/src/main/java/DefaultsGroup.java index f95b3a8595..5e58fef6c4 100644 --- a/runescape-client/src/main/java/DefaultsGroup.java +++ b/runescape-client/src/main/java/DefaultsGroup.java @@ -1,29 +1,168 @@ +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("kd") +@ObfuscatedName("kz") @Implements("DefaultsGroup") public class DefaultsGroup { - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lkd;" - ) - static final DefaultsGroup field3797; @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "Lkz;" + ) + static final DefaultsGroup field3796; + @ObfuscatedName("w") + @Export("JagexCache_locationFile") + static File JagexCache_locationFile; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -757733349 + intValue = 154892097 ) @Export("group") final int group; static { - field3797 = new DefaultsGroup(3); + field3796 = new DefaultsGroup(3); } DefaultsGroup(int var1) { this.group = var1; } + + @ObfuscatedName("ii") + @ObfuscatedSignature( + signature = "(Liw;IIII)V", + garbageValue = "-2125986282" + ) + @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; + int var7; + int var8; + if (var0.combatLevel != 0) { + var7 = var0.combatLevel; + var8 = Message.localPlayer.combatLevel; + int var9 = var8 - var7; + String var6; + if (var9 < -9) { + var6 = NPC.colorStartTag(16711680); + } else if (var9 < -6) { + var6 = NPC.colorStartTag(16723968); + } else if (var9 < -3) { + var6 = NPC.colorStartTag(16740352); + } else if (var9 < 0) { + var6 = NPC.colorStartTag(16756736); + } else if (var9 > 9) { + var6 = NPC.colorStartTag(65280); + } else if (var9 > 6) { + var6 = NPC.colorStartTag(4259584); + } else if (var9 > 3) { + var6 = NPC.colorStartTag(8453888); + } else if (var9 > 0) { + var6 = NPC.colorStartTag(12648192); + } else { + var6 = NPC.colorStartTag(16776960); + } + + var4 = var4 + var6 + " " + " (" + "level-" + var0.combatLevel + ")"; + } + + if (var0.isFollower && Client.followerOpsLowPriority) { + class1.insertMenuItemNoShift("Examine", NPC.colorStartTag(16776960) + var4, 1003, var1, var2, var3); + } + + if (Client.isItemSelected == 1) { + class1.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + NPC.colorStartTag(16776960) + var4, 7, var1, var2, var3); + } else if (Client.isSpellSelected) { + if ((ReflectionCheck.selectedSpellFlags & 2) == 2) { + class1.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + NPC.colorStartTag(16776960) + var4, 8, var1, var2, var3); + } + } else { + int var10 = var0.isFollower && Client.followerOpsLowPriority ? 2000 : 0; + String[] var11 = var0.actions; + if (var11 != null) { + for (var7 = 4; var7 >= 0; --var7) { + if (var11[var7] != null && !var11[var7].equalsIgnoreCase("Attack")) { + var8 = 0; + if (var7 == 0) { + var8 = var10 + 9; + } + + if (var7 == 1) { + var8 = var10 + 10; + } + + if (var7 == 2) { + var8 = var10 + 11; + } + + if (var7 == 3) { + var8 = var10 + 12; + } + + if (var7 == 4) { + var8 = var10 + 13; + } + + class1.insertMenuItemNoShift(var11[var7], NPC.colorStartTag(16776960) + var4, var8, var1, var2, var3); + } + } + } + + if (var11 != null) { + for (var7 = 4; var7 >= 0; --var7) { + if (var11[var7] != null && var11[var7].equalsIgnoreCase("Attack")) { + short var12 = 0; + if (Client.npcAttackOption != AttackOption.AttackOption_hidden) { + if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || AttackOption.AttackOption_dependsOnCombatLevels == Client.npcAttackOption && var0.combatLevel > Message.localPlayer.combatLevel) { + var12 = 2000; + } + + var8 = 0; + if (var7 == 0) { + var8 = var12 + 9; + } + + if (var7 == 1) { + var8 = var12 + 10; + } + + if (var7 == 2) { + var8 = var12 + 11; + } + + if (var7 == 3) { + var8 = var12 + 12; + } + + if (var7 == 4) { + var8 = var12 + 13; + } + + class1.insertMenuItemNoShift(var11[var7], NPC.colorStartTag(16776960) + var4, var8, var1, var2, var3); + } + } + } + } + + if (!var0.isFollower || !Client.followerOpsLowPriority) { + class1.insertMenuItemNoShift("Examine", NPC.colorStartTag(16776960) + var4, 1003, var1, var2, var3); + } + } + + } + } + } + } + } } diff --git a/runescape-client/src/main/java/DemotingHashTable.java b/runescape-client/src/main/java/DemotingHashTable.java index 6274341083..c020d9fdb0 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("eo") +@ObfuscatedName("fe") @Implements("DemotingHashTable") public final class DemotingHashTable { - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("capacity") int capacity; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("remaining") int remaining; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Llb;" + signature = "Llc;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Ljz;" + signature = "Lji;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lex;" + signature = "Lem;" ) - class146 field1960; + class155 field1978; public DemotingHashTable(int var1, int var2) { this.queue = new IterableDualNodeQueue(); @@ -42,7 +42,7 @@ public final class DemotingHashTable { this.hashTable = new IterableNodeHashTable(var3); } - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("get") public Object get(long var1) { Wrapper var3 = (Wrapper)this.hashTable.get(var1); @@ -73,16 +73,16 @@ public final class DemotingHashTable { } } - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("remove") void remove(long var1) { Wrapper var3 = (Wrapper)this.hashTable.get(var1); this.removeWrapper(var3); } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Lev;)V" + signature = "(Lff;)V" ) @Export("removeWrapper") void removeWrapper(Wrapper var1) { @@ -94,7 +94,7 @@ public final class DemotingHashTable { } - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("put") public void put(Object var1, long var2, int var4) { if (var4 > this.capacity) { @@ -113,8 +113,8 @@ public final class DemotingHashTable { } this.removeWrapper(var5); - if (this.field1960 != null) { - this.field1960.method3382(var5.get()); + if (this.field1978 != null) { + this.field1978.method3386(var5.get()); } } @@ -125,7 +125,7 @@ public final class DemotingHashTable { } } - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("demote") public void demote(int var1) { for (Wrapper var2 = (Wrapper)this.queue.last(); var2 != null; var2 = (Wrapper)this.queue.previous()) { @@ -146,7 +146,7 @@ public final class DemotingHashTable { } - @ObfuscatedName("p") + @ObfuscatedName("b") @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 e37f47f796..ac30bf1177 100644 --- a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java +++ b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java @@ -1,3 +1,5 @@ +import java.io.DataInputStream; +import java.net.URL; import java.util.Random; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; @@ -5,38 +7,38 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("li") +@ObfuscatedName("lb") @Implements("DesktopPlatformInfoProvider") public class DesktopPlatformInfoProvider implements PlatformInfoProvider { - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -628926999 + intValue = 2108856267 ) int field3897; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = 1090209519 - ) - int field3899; @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1137197967 + intValue = -526176171 ) - int field3900; + int field3896; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -1221750841 + ) + int field3899; - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(B)Llj;", - garbageValue = "-40" + signature = "(B)Llx;", + garbageValue = "-83" ) @Export("get") public PlatformInfo get() { byte var1; - if (WorldMapIcon_0.field131.startsWith("win")) { + if (class81.field1129.startsWith("win")) { var1 = 1; - } else if (WorldMapIcon_0.field131.startsWith("mac")) { + } else if (class81.field1129.startsWith("mac")) { var1 = 2; - } else if (WorldMapIcon_0.field131.startsWith("linux")) { + } else if (class81.field1129.startsWith("linux")) { var1 = 3; } else { var1 = 4; @@ -134,7 +136,7 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { var8 = 4; } - this.method6345(var5); + this.method6317(var5); Runtime.getRuntime(); int var10 = (int)((long)((new Random()).nextInt(31457280) + 230686720) / 1048576L) + 1; int var11; @@ -152,55 +154,98 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { String var17 = ""; String var18 = ""; int[] var23 = new int[3]; - return new PlatformInfo(var1, var24, var7, var8, this.field3897, this.field3899, this.field3900, 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.field3897, this.field3896, this.field3899, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(Ljava/lang/String;B)V", - garbageValue = "-51" + garbageValue = "-1" ) - void method6345(String var1) { + void method6317(String var1) { if (var1.startsWith("1.")) { - this.method6349(var1); + this.method6316(var1); } else { - this.method6343(var1); + this.method6324(var1); } } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "-907450519" + signature = "(Ljava/lang/String;B)V", + garbageValue = "50" ) - void method6349(String var1) { + void method6316(String var1) { String[] var2 = var1.split("\\."); try { this.field3897 = Integer.parseInt(var2[1]); var2 = var2[2].split("_"); - this.field3899 = Integer.parseInt(var2[0]); - this.field3900 = Integer.parseInt(var2[1]); + this.field3896 = Integer.parseInt(var2[0]); + this.field3899 = Integer.parseInt(var2[1]); } catch (Exception var4) { } } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(Ljava/lang/String;I)V", - garbageValue = "-342949877" + garbageValue = "1412850976" ) - void method6343(String var1) { + void method6324(String var1) { String[] var2 = var1.split("\\."); try { this.field3897 = Integer.parseInt(var2[0]); - this.field3899 = Integer.parseInt(var2[1]); - this.field3900 = Integer.parseInt(var2[2]); + this.field3896 = Integer.parseInt(var2[1]); + this.field3899 = Integer.parseInt(var2[2]); } catch (Exception var4) { } } + + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;Ljava/lang/Throwable;B)V", + garbageValue = "0" + ) + @Export("RunException_sendStackTrace") + public static void RunException_sendStackTrace(String var0, Throwable var1) { + if (var1 != null) { + var1.printStackTrace(); + } else { + try { + String var2 = ""; + if (var1 != null) { + var2 = GrandExchangeOfferUnitPriceComparator.method124(var1); + } + + if (var0 != null) { + if (var1 != null) { + var2 = var2 + " | "; + } + + var2 = var2 + var0; + } + + System.out.println("Error: " + var2); + var2 = var2.replace(':', '.'); + var2 = var2.replace('@', '_'); + var2 = var2.replace('&', '_'); + var2 = var2.replace('#', '_'); + if (RunException.RunException_applet == null) { + return; + } + + URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + RunException.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + RunException.clientType + "&e=" + var2); + DataInputStream var4 = new DataInputStream(var3.openStream()); + var4.read(); + var4.close(); + } catch (Exception var5) { + } + + } + } } diff --git a/runescape-client/src/main/java/DevicePcmPlayer.java b/runescape-client/src/main/java/DevicePcmPlayer.java index c209b0bcfc..dcd4eb1982 100644 --- a/runescape-client/src/main/java/DevicePcmPlayer.java +++ b/runescape-client/src/main/java/DevicePcmPlayer.java @@ -9,54 +9,54 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("as") +@ObfuscatedName("ai") @Implements("DevicePcmPlayer") public class DevicePcmPlayer extends PcmPlayer { - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("format") AudioFormat format; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("line") SourceDataLine line; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 447959355 + intValue = 828002731 ) @Export("capacity2") int capacity2; - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("byteSamples") byte[] byteSamples; DevicePcmPlayer() { } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "347893346" + signature = "(B)V", + garbageValue = "15" ) @Export("init") protected void init() { - this.format = new AudioFormat((float)Messages.PcmPlayer_sampleRate, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false); - this.byteSamples = new byte[256 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; + this.format = new AudioFormat((float)(DirectByteArrayCopier.field2490 * -168449264), 16, SoundCache.PcmPlayer_stereo ? 2 : 1, true, false); + this.byteSamples = new byte[256 << (SoundCache.PcmPlayer_stereo ? 2 : 1)]; } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "25" + signature = "(II)V", + garbageValue = "797185937" ) @Export("open") protected void open(int var1) throws LineUnavailableException { try { - Info var2 = new Info(SourceDataLine.class, this.format, var1 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); + Info var2 = new Info(SourceDataLine.class, this.format, var1 << (SoundCache.PcmPlayer_stereo ? 2 : 1)); this.line = (SourceDataLine)AudioSystem.getLine(var2); this.line.open(); this.line.start(); this.capacity2 = var1; } catch (LineUnavailableException var5) { - if (BoundaryObject.method3312(var1) != 1) { + if (ScriptFrame.method1109(var1) != 1) { int var4 = var1 - 1; var4 |= var4 >>> 1; var4 |= var4 >>> 2; @@ -72,21 +72,21 @@ public class DevicePcmPlayer extends PcmPlayer { } } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "80" + signature = "(I)I", + garbageValue = "2013132005" ) @Export("position") protected int position() { - return this.capacity2 - (this.line.available() >> (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); + return this.capacity2 - (this.line.available() >> (SoundCache.PcmPlayer_stereo ? 2 : 1)); } - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("write") protected void write() { int var1 = 256; - if (PcmPlayer.PcmPlayer_stereo) { + if (SoundCache.PcmPlayer_stereo) { var1 <<= 1; } @@ -103,10 +103,10 @@ public class DevicePcmPlayer extends PcmPlayer { this.line.write(this.byteSamples, 0, var1 << 1); } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1441503616" + signature = "(S)V", + garbageValue = "390" ) @Export("close") protected void close() { @@ -117,10 +117,10 @@ public class DevicePcmPlayer extends PcmPlayer { } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "45" + signature = "(I)V", + garbageValue = "1127195595" ) @Export("discard") protected void discard() { diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index 265e0a3975..d71035f8fc 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -2,47 +2,226 @@ 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("al") +@ObfuscatedName("ax") @Implements("DevicePcmPlayerProvider") -public class DevicePcmPlayerProvider implements class99 { - @ObfuscatedName("jx") - @ObfuscatedSignature( - signature = "Lhl;" - ) - @Export("dragInventoryWidget") - static Widget dragInventoryWidget; +public class DevicePcmPlayerProvider implements class97 { + @ObfuscatedName("aq") + static String field391; DevicePcmPlayerProvider() { } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(I)Lde;", - garbageValue = "2104968763" + signature = "(I)Lcw;", + garbageValue = "479224621" ) @Export("player") public PcmPlayer player() { return new DevicePcmPlayer(); } - @ObfuscatedName("fz") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "2048125775" + signature = "(Lhz;Lhz;ZII)V", + garbageValue = "808644232" ) - @Export("forceDisconnect") - static final void forceDisconnect(int var0) { - class40.logOut(); - switch(var0) { - case 1: - Login.loginIndex = 24; - PacketWriter.setLoginResponseString("", "You were disconnected from the server.", ""); - break; - case 2: - Login.loginIndex = 24; - PacketWriter.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); + static void method841(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { + if (Login.field1173) { + if (var3 == 4) { + Login.loginIndex = 4; + } + + } else { + Login.loginIndex = var3; + Rasterizer2D.Rasterizer2D_clear(); + byte[] var4 = var0.takeFileByNames("title.jpg", ""); + UrlRequest.leftTitleSprite = GrandExchangeOfferTotalQuantityComparator.convertJpgToSprite(var4); + ScriptFrame.rightTitleSprite = UrlRequest.leftTitleSprite.mirrorHorizontally(); + if ((Client.worldProperties & 536870912) != 0) { + Login.logoSprite = Canvas.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); + } else if ((Client.worldProperties & 1073741824) != 0) { + Login.logoSprite = Canvas.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); + } else { + Login.logoSprite = Canvas.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); + } + + Login.titleboxSprite = Canvas.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); + Login.titlebuttonSprite = Canvas.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); + Login.runesSprite = class195.method3667(var1, "runes", ""); + class30.title_muteSprite = class195.method3667(var1, "title_mute", ""); + class218.options_buttons_0Sprite = Canvas.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); + GrandExchangeOffer.field64 = Canvas.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); + Login.options_buttons_2Sprite = Canvas.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); + Login.field1162 = Canvas.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); + IgnoreList.field3579 = class218.options_buttons_0Sprite.subWidth; + MenuAction.field1133 = class218.options_buttons_0Sprite.subHeight; + StructDefinition.loginScreenRunesAnimation = new LoginScreenAnimation(Login.runesSprite); + if (var2) { + Login.Login_username = ""; + Login.Login_password = ""; + } + + class266.field3517 = 0; + class80.otp = ""; + Login.field1178 = true; + Login.worldSelectOpen = false; + if (!Interpreter.clientPreferences.titleMusicDisabled) { + WorldMapCacheName.method616(2, GrandExchangeOfferWorldComparator.archive6, "scape main", "", 255, false); + } else { + BoundaryObject.method3273(2); + } + + BuddyRankComparator.method3362(false); + Login.field1173 = true; + Login.xPadding = (GrandExchangeOfferTotalQuantityComparator.canvasWidth - 765) / 2; + Login.loginBoxX = Login.xPadding + 202; + Script.loginBoxCenter = Login.loginBoxX + 180; + UrlRequest.leftTitleSprite.drawAt(Login.xPadding, 0); + ScriptFrame.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); + } + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "(Lhz;Lhz;Lhz;Lhz;B)V", + garbageValue = "0" + ) + public static void method842(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, AbstractArchive var3) { + FriendLoginUpdate.Widget_archive = var0; + Widget.Widget_modelsArchive = var1; + BoundaryObject.Widget_spritesArchive = var2; + MilliClock.Widget_fontsArchive = var3; + UserComparator7.Widget_interfaceComponents = new Widget[FriendLoginUpdate.Widget_archive.getGroupCount()][]; + Widget.Widget_loadedInterfaces = new boolean[FriendLoginUpdate.Widget_archive.getGroupCount()]; + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + signature = "(ILcu;ZI)I", + garbageValue = "1220009444" + ) + static int method840(int var0, Script var1, boolean var2) { + int var3; + int var4; + int var6; + if (var0 == ScriptOpcodes.ENUM_STRING) { + class188.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + EnumDefinition var5 = World.getEnum(var3); + if (var5.outputType != 's') { + } + + for (var6 = 0; var6 < var5.outputCount; ++var6) { + if (var4 == var5.keys[var6]) { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var5.strVals[var6]; + var5 = null; + break; + } + } + + if (var5 != null) { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var5.defaultStr; + } + + return 1; + } else if (var0 != ScriptOpcodes.ENUM) { + if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + EnumDefinition var10 = World.getEnum(var3); + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var10.size(); + return 1; + } else { + return 2; + } + } else { + class188.Interpreter_intStackSize -= 4; + var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + int var9 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 2]; + var6 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 3]; + EnumDefinition var7 = World.getEnum(var9); + if (var3 == var7.inputType && var4 == var7.outputType) { + for (int var8 = 0; var8 < var7.outputCount; ++var8) { + if (var6 == var7.keys[var8]) { + if (var4 == 115) { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var7.strVals[var8]; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var7.intVals[var8]; + } + + var7 = null; + break; + } + } + + if (var7 != null) { + if (var4 == 115) { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var7.defaultStr; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var7.defaultInt; + } + } + + return 1; + } else { + if (var4 == 115) { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = "null"; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } + } + } + + @ObfuscatedName("iv") + @ObfuscatedSignature( + signature = "(IIIIIIB)V", + garbageValue = "89" + ) + static final void method839(int var0, int var1, int var2, int var3, int var4, int var5) { + int var6 = var2 - var0; + int var7 = var3 - var1; + int var8 = var6 >= 0 ? var6 : -var6; + int var9 = var7 >= 0 ? var7 : -var7; + int var10 = var8; + if (var8 < var9) { + var10 = var9; } + if (var10 != 0) { + int var11 = (var6 << 16) / var10; + int var12 = (var7 << 16) / var10; + if (var12 <= var11) { + var11 = -var11; + } else { + var12 = -var12; + } + + int var13 = var5 * var12 >> 17; + int var14 = var5 * var12 + 1 >> 17; + int var15 = var5 * var11 >> 17; + int var16 = var5 * var11 + 1 >> 17; + var0 -= Rasterizer2D.Rasterizer2D_xClipStart; + var1 -= Rasterizer2D.Rasterizer2D_yClipStart; + int var17 = var0 + var13; + int var18 = var0 - var14; + int var19 = var0 + var6 - var14; + int var20 = var0 + var13 + var6; + int var21 = var15 + var1; + int var22 = var1 - var16; + int var23 = var7 + var1 - var16; + int var24 = var7 + var15 + var1; + Rasterizer3D.method3078(var17, var18, var19); + Rasterizer3D.method3008(var21, var22, var23, var17, var18, var19, var4); + Rasterizer3D.method3078(var17, var19, var20); + Rasterizer3D.method3008(var21, var23, var24, var17, var19, var20, var4); + } } } diff --git a/runescape-client/src/main/java/DirectByteArrayCopier.java b/runescape-client/src/main/java/DirectByteArrayCopier.java index 3b1617cee3..5e92d572a9 100644 --- a/runescape-client/src/main/java/DirectByteArrayCopier.java +++ b/runescape-client/src/main/java/DirectByteArrayCopier.java @@ -1,45 +1,39 @@ import java.nio.ByteBuffer; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gu") +@ObfuscatedName("he") @Implements("DirectByteArrayCopier") public class DirectByteArrayCopier extends AbstractByteArrayCopier { - @ObfuscatedName("az") - @ObfuscatedSignature( - signature = "Llp;" + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 1433331089 ) - @Export("rasterProvider") - public static AbstractRasterProvider rasterProvider; - @ObfuscatedName("dr") - @ObfuscatedSignature( - signature = "Lij;" - ) - @Export("archive5") - static Archive archive5; - @ObfuscatedName("u") + public static int field2490; + @ObfuscatedName("f") @Export("directBuffer") ByteBuffer directBuffer; - @ObfuscatedName("b") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(S)[B", - garbageValue = "18982" + signature = "(I)[B", + garbageValue = "-112018699" ) @Export("get") - byte[] get() { + public byte[] get() { byte[] var1 = new byte[this.directBuffer.capacity()]; this.directBuffer.position(0); this.directBuffer.get(var1); return var1; } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "([BI)V", - garbageValue = "-1436271820" + signature = "([BB)V", + garbageValue = "33" ) @Export("set") public void set(byte[] var1) { @@ -48,18 +42,12 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier { this.directBuffer.put(var1); } - @ObfuscatedName("p") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(CI)Z", - garbageValue = "-1809076627" + signature = "(Lhz;B)V", + garbageValue = "7" ) - static boolean method4010(char var0) { - for (int var1 = 0; var1 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var1) { - if (var0 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var1)) { - return true; - } - } - - return false; + public static void method3940(AbstractArchive var0) { + class286.EnumDefinition_archive = var0; } } diff --git a/runescape-client/src/main/java/DirectWrapper.java b/runescape-client/src/main/java/DirectWrapper.java index 4ac6db4a2a..aebbb7fb58 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("ep") +@ObfuscatedName("fd") @Implements("DirectWrapper") public class DirectWrapper extends Wrapper { - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("obj") Object obj; @@ -14,13 +14,13 @@ public class DirectWrapper extends Wrapper { this.obj = var1; } - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("get") Object get() { return this.obj; } - @ObfuscatedName("f") + @ObfuscatedName("i") @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 0007a4f0f3..21454bbd81 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("fn") +@ObfuscatedName("gw") @Implements("DualNode") public class DualNode extends Node { - @ObfuscatedName("ci") + @ObfuscatedName("cu") @Export("keyDual") public long keyDual; - @ObfuscatedName("cu") + @ObfuscatedName("cg") @ObfuscatedSignature( - signature = "Lfn;" + signature = "Lgw;" ) @Export("previousDual") public DualNode previousDual; - @ObfuscatedName("cs") + @ObfuscatedName("ct") @ObfuscatedSignature( - signature = "Lfn;" + signature = "Lgw;" ) @Export("nextDual") public DualNode nextDual; - @ObfuscatedName("cn") + @ObfuscatedName("cz") @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 d3063fc7bb..2dc0f382fd 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("iw") +@ObfuscatedName("in") @Implements("DualNodeDeque") public final class DualNodeDeque { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lfn;" + signature = "Lgw;" ) @Export("sentinel") DualNode sentinel; @@ -19,9 +19,9 @@ public final class DualNodeDeque { this.sentinel.nextDual = this.sentinel; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Lfn;)V" + signature = "(Lgw;)V" ) @Export("addFirst") public void addFirst(DualNode var1) { @@ -35,9 +35,9 @@ public final class DualNodeDeque { var1.previousDual.nextDual = var1; } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lfn;)V" + signature = "(Lgw;)V" ) @Export("addLast") public void addLast(DualNode var1) { @@ -51,9 +51,9 @@ public final class DualNodeDeque { var1.previousDual.nextDual = var1; } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "()Lfn;" + signature = "()Lgw;" ) @Export("removeLast") public DualNode removeLast() { diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index 81d621e05a..5b1f30a65e 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -4,72 +4,66 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cu") +@ObfuscatedName("cg") @Implements("DynamicObject") public class DynamicObject extends Entity { - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "Lbv;" - ) - @Export("loginScreenRunesAnimation") - static LoginScreenAnimation loginScreenRunesAnimation; - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -679887147 + intValue = -95317183 ) @Export("id") int id; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 431933847 + intValue = 1520992013 ) @Export("type") int type; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -68495843 + intValue = 1128540715 ) @Export("orientation") int orientation; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1644974197 + intValue = 1824445575 ) @Export("plane") int plane; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 707207003 + intValue = -1187953645 ) @Export("x") int x; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1196896887 + intValue = -589129473 ) @Export("y") int y; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Liy;" + signature = "Liv;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 672363513 + intValue = 1848001731 ) @Export("frame") int frame; - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1683729561 + intValue = 22641631 ) @Export("cycleStart") int cycleStart; @ObfuscatedSignature( - signature = "(IIIIIIIZLee;)V" + signature = "(IIIIIIIZLep;)V" ) DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Entity var9) { this.id = var1; @@ -79,12 +73,12 @@ public class DynamicObject extends Entity { this.x = var5; this.y = var6; if (var7 != -1) { - this.sequenceDefinition = GrandExchangeOfferAgeComparator.SequenceDefinition_get(var7); + this.sequenceDefinition = WorldMapSection0.SequenceDefinition_get(var7); this.frame = 0; this.cycleStart = Client.cycle - 1; - if (this.sequenceDefinition.field3533 == 0 && var9 != null && var9 instanceof DynamicObject) { + if (this.sequenceDefinition.field3495 == 0 && var9 != null && var9 instanceof DynamicObject) { DynamicObject var10 = (DynamicObject)var9; - if (var10.sequenceDefinition == this.sequenceDefinition) { + if (this.sequenceDefinition == var10.sequenceDefinition) { this.frame = var10.frame; this.cycleStart = var10.cycleStart; return; @@ -99,10 +93,10 @@ public class DynamicObject extends Entity { } - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)Ldf;", - garbageValue = "-174129419" + signature = "(I)Ldw;", + garbageValue = "822221372" ) @Export("getModel") protected final Model getModel() { @@ -132,7 +126,7 @@ public class DynamicObject extends Entity { this.cycleStart = Client.cycle - var1; } - ObjectDefinition var12 = Occluder.getObjectDefinition(this.id); + ObjectDefinition var12 = Coord.getObjectDefinition(this.id); if (var12.transforms != null) { var12 = var12.transform(); } @@ -155,131 +149,76 @@ public class DynamicObject extends Entity { int var6 = (var3 >> 1) + this.y; int var7 = (var3 + 1 >> 1) + this.y; int[][] var8 = Tiles.Tiles_heights[this.plane]; - int var9 = var8[var5][var7] + var8[var5][var6] + var8[var4][var6] + var8[var4][var7] >> 2; + int var9 = var8[var4][var7] + var8[var4][var6] + var8[var5][var6] + 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("g") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1357680514" + signature = "([Lgz;II)Lgz;", + garbageValue = "2071189465" ) - public static void method2263(int var0) { - if (var0 != -1) { - if (Widget.Widget_loadedInterfaces[var0]) { - InvDefinition.Widget_archive.clearFilesGroup(var0); - if (FloorDecoration.Widget_interfaceComponents[var0] != null) { - boolean var1 = true; + @Export("findEnumerated") + public static Enumerated findEnumerated(Enumerated[] var0, int var1) { + Enumerated[] var2 = var0; - for (int var2 = 0; var2 < FloorDecoration.Widget_interfaceComponents[var0].length; ++var2) { - if (FloorDecoration.Widget_interfaceComponents[var0][var2] != null) { - if (FloorDecoration.Widget_interfaceComponents[var0][var2].type != 2) { - FloorDecoration.Widget_interfaceComponents[var0][var2] = null; - } else { - var1 = false; - } + for (int var3 = 0; var3 < var2.length; ++var3) { + Enumerated var4 = var2[var3]; + if (var1 == var4.rsOrdinal()) { + return var4; + } + } + + return null; + } + + @ObfuscatedName("jr") + @ObfuscatedSignature( + signature = "([Lha;II)V", + garbageValue = "-794395559" + ) + @Export("runComponentCloseListeners") + static final void runComponentCloseListeners(Widget[] var0, int var1) { + for (int var2 = 0; var2 < var0.length; ++var2) { + Widget var3 = var0[var2]; + if (var3 != null) { + if (var3.type == 0) { + if (var3.children != null) { + runComponentCloseListeners(var3.children, var1); + } + + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); + if (var4 != null) { + ItemContainer.runIntfCloseListeners(var4.group, var1); + } + } + + ScriptEvent var5; + if (var1 == 0 && var3.onDialogAbort != null) { + var5 = new ScriptEvent(); + var5.widget = var3; + var5.args = var3.onDialogAbort; + Client.runScriptEvent(var5); + } + + if (var1 == 1 && var3.onSubChange != null) { + if (var3.childIndex >= 0) { + Widget var6 = Tile.getWidget(var3.id); + if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { + continue; } } - if (var1) { - FloorDecoration.Widget_interfaceComponents[var0] = null; - } - - Widget.Widget_loadedInterfaces[var0] = false; + var5 = new ScriptEvent(); + var5.widget = var3; + var5.args = var3.onSubChange; + Client.runScriptEvent(var5); } } } - } - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "514266465" - ) - public static void method2259() { - KitDefinition.KitDefinition_cached.clear(); - } - - @ObfuscatedName("hw") - @ObfuscatedSignature( - signature = "(ZLkj;B)V", - garbageValue = "4" - ) - static final void method2262(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 = Client.defaultRotations[var1.readBits(3)]; - if (var3) { - var4.orientation = var4.rotation = var5; - } - - int var6 = var1.readBits(1); - var4.definition = VarcInt.getNpcDefinition(var1.readBits(14)); - int var7; - if (var0) { - var7 = var1.readBits(8); - if (var7 > 127) { - var7 -= 256; - } - } else { - var7 = var1.readBits(5); - if (var7 > 15) { - var7 -= 32; - } - } - - int var8; - if (var0) { - var8 = var1.readBits(8); - if (var8 > 127) { - var8 -= 256; - } - } else { - var8 = var1.readBits(5); - if (var8 > 15) { - var8 -= 32; - } - } - - int var9 = var1.readBits(1); - if (var9 == 1) { - Client.field688[++Client.field687 - 1] = var2; - } - - var4.field938 = var4.definition.size; - var4.field988 = var4.definition.rotation; - if (var4.field988 == 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.method2059(class215.localPlayer.pathX[0] + var7, class215.localPlayer.pathY[0] + var8, var6 == 1); - continue; - } - } - - var1.exportIndex(); - return; - } } } diff --git a/runescape-client/src/main/java/Entity.java b/runescape-client/src/main/java/Entity.java index 6e9609a917..5b4d820135 100644 --- a/runescape-client/src/main/java/Entity.java +++ b/runescape-client/src/main/java/Entity.java @@ -4,12 +4,12 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ee") +@ObfuscatedName("ep") @Implements("Entity") public abstract class Entity extends DualNode { - @ObfuscatedName("cq") + @ObfuscatedName("ce") @ObfuscatedGetter( - intValue = -254761411 + intValue = -294742571 ) @Export("height") public int height; @@ -18,10 +18,10 @@ public abstract class Entity extends DualNode { this.height = 1000; } - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)Ldf;", - garbageValue = "-174129419" + signature = "(I)Ldw;", + garbageValue = "822221372" ) @Export("getModel") protected Model getModel() { @@ -38,69 +38,4 @@ public abstract class Entity extends DualNode { } } - - @ObfuscatedName("iz") - @ObfuscatedSignature( - signature = "(Lbg;IIIB)V", - garbageValue = "40" - ) - @Export("addPlayerToMenu") - static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { - if (class215.localPlayer != var0) { - if (Client.menuOptionsCount < 400) { - String var4; - if (var0.skillLevel == 0) { - var4 = var0.actions[0] + var0.username + var0.actions[1] + GrandExchangeOfferWorldComparator.method77(var0.combatLevel, class215.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) { - WorldMapSprite.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class222.colorStartTag(16777215) + var4, 14, var1, var2, var3); - } else if (Client.isSpellSelected) { - if ((Actor.selectedSpellFlags & 8) == 8) { - WorldMapSprite.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class222.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 (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > class215.localPlayer.combatLevel) { - var6 = 2000; - } - - if (class215.localPlayer.team != 0 && var0.team != 0) { - if (var0.team == class215.localPlayer.team) { - var6 = 2000; - } else { - var6 = 0; - } - } - } else if (Client.playerOptionsPriorities[var5]) { - var6 = 2000; - } - - boolean var7 = false; - int var8 = Client.playerMenuOpcodes[var5] + var6; - WorldMapSprite.insertMenuItemNoShift(Client.playerMenuActions[var5], class222.colorStartTag(16777215) + var4, var8, var1, var2, var3); - } - } - } - - for (var5 = 0; var5 < Client.menuOptionsCount; ++var5) { - if (Client.menuOpcodes[var5] == 23) { - Client.menuTargets[var5] = class222.colorStartTag(16777215) + var4; - break; - } - } - - } - } - } } diff --git a/runescape-client/src/main/java/EnumDefinition.java b/runescape-client/src/main/java/EnumDefinition.java index 84ee0662e5..59dc8f5856 100644 --- a/runescape-client/src/main/java/EnumDefinition.java +++ b/runescape-client/src/main/java/EnumDefinition.java @@ -4,49 +4,43 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("in") +@ObfuscatedName("ik") @Implements("EnumDefinition") public class EnumDefinition extends DualNode { - @ObfuscatedName("u") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lhf;" - ) - @Export("EnumDefinition_archive") - static AbstractArchive EnumDefinition_archive; - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "Lef;" + signature = "Leb;" ) @Export("EnumDefinition_cached") static EvictingDualNodeHashTable EnumDefinition_cached; - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("inputType") public char inputType; - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("outputType") public char outputType; - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -687974969 + intValue = 1935496033 ) @Export("defaultInt") public int defaultInt; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1462437727 + intValue = 2015380105 ) @Export("outputCount") public int outputCount; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("keys") public int[] keys; - @ObfuscatedName("w") + @ObfuscatedName("a") @Export("intVals") public int[] intVals; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("strVals") public String[] strVals; @@ -59,10 +53,10 @@ public class EnumDefinition extends DualNode { this.outputCount = 0; } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Lkg;I)V", - garbageValue = "-858026130" + signature = "(Lkq;I)V", + garbageValue = "-1351538350" ) @Export("decode") void decode(Buffer var1) { @@ -76,10 +70,10 @@ public class EnumDefinition extends DualNode { } } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lkg;II)V", - garbageValue = "248753838" + signature = "(Lkq;II)V", + garbageValue = "789591005" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -116,377 +110,13 @@ public class EnumDefinition extends DualNode { } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1646358574" + garbageValue = "-1025007031" ) @Export("size") public int size() { return this.outputCount; } - - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "(IIIIIILel;Lfh;I)V", - garbageValue = "1647105288" - ) - static final void method4656(int var0, int var1, int var2, int var3, int var4, int var5, Scene var6, CollisionMap var7) { - if (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) { - if (var0 < Tiles.Tiles_minPlane) { - Tiles.Tiles_minPlane = var0; - } - - ObjectDefinition var8 = Occluder.getObjectDefinition(var3); - int var9; - int var10; - if (var4 != 1 && var4 != 3) { - var9 = var8.sizeX; - var10 = var8.sizeY; - } else { - var9 = var8.sizeY; - var10 = var8.sizeX; - } - - int var11; - int var12; - if (var9 + var1 <= 104) { - var11 = (var9 >> 1) + var1; - var12 = (var9 + 1 >> 1) + var1; - } else { - var11 = var1; - var12 = var1 + 1; - } - - int var13; - int var14; - if (var10 + var2 <= 104) { - var13 = (var10 >> 1) + var2; - var14 = var2 + (var10 + 1 >> 1); - } else { - var13 = var2; - var14 = var2 + 1; - } - - int[][] var15 = Tiles.Tiles_heights[var0]; - int var16 = var15[var11][var14] + var15[var12][var13] + var15[var11][var13] + var15[var12][var14] >> 2; - int var17 = (var1 << 7) + (var9 << 6); - int var18 = (var2 << 7) + (var10 << 6); - long var19 = MouseHandler.calculateTag(var1, var2, 2, var8.int1 == 0, var3); - int var21 = var5 + (var4 << 6); - if (var8.int3 == 1) { - var21 += 256; - } - - if (var8.hasSound()) { - WorldMapData_1.method737(var0, var1, var2, var8, var4); - } - - Object var22; - if (var5 == 22) { - if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(22, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newFloorDecoration(var0, var1, var2, var16, (Entity)var22, var19, var21); - if (var8.interactType == 1 && var7 != null) { - var7.setBlockedByFloorDec(var1, var2); - } - - } - } else { - int var23; - if (var5 != 10 && var5 != 11) { - int[] var10000; - if (var5 >= 12) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(var5, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.method3242(var0, var1, var2, var16, 1, 1, (Entity)var22, 0, var19, var21); - if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { - var10000 = WorldMapLabel.field233[var0][var1]; - var10000[var2] |= 2340; - } - - if (var8.interactType != 0 && var7 != null) { - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - } else if (var5 == 0) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(0, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var22, (Entity)null, Tiles.field505[var4], 0, var19, var21); - if (var4 == 0) { - if (var8.clipped) { - class51.field423[var0][var1][var2] = 50; - class51.field423[var0][var1][var2 + 1] = 50; - } - - if (var8.modelClipped) { - var10000 = WorldMapLabel.field233[var0][var1]; - var10000[var2] |= 585; - } - } else if (var4 == 1) { - if (var8.clipped) { - class51.field423[var0][var1][var2 + 1] = 50; - class51.field423[var0][var1 + 1][var2 + 1] = 50; - } - - if (var8.modelClipped) { - var10000 = WorldMapLabel.field233[var0][var1]; - var10000[var2 + 1] |= 1170; - } - } else if (var4 == 2) { - if (var8.clipped) { - class51.field423[var0][var1 + 1][var2] = 50; - class51.field423[var0][var1 + 1][var2 + 1] = 50; - } - - if (var8.modelClipped) { - var10000 = WorldMapLabel.field233[var0][var1 + 1]; - var10000[var2] |= 585; - } - } else if (var4 == 3) { - if (var8.clipped) { - class51.field423[var0][var1][var2] = 50; - class51.field423[var0][var1 + 1][var2] = 50; - } - - if (var8.modelClipped) { - var10000 = WorldMapLabel.field233[var0][var1]; - var10000[var2] |= 1170; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3614(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method3124(var0, var1, var2, var8.int2); - } - - } else if (var5 == 1) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(1, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var22, (Entity)null, Tiles.field506[var4], 0, var19, var21); - if (var8.clipped) { - if (var4 == 0) { - class51.field423[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { - class51.field423[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { - class51.field423[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { - class51.field423[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3614(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.field505[var4], Tiles.field505[var28], var19, var21); - if (var8.modelClipped) { - if (var4 == 0) { - var10000 = WorldMapLabel.field233[var0][var1]; - var10000[var2] |= 585; - var10000 = WorldMapLabel.field233[var0][var1]; - var10000[1 + var2] |= 1170; - } else if (var4 == 1) { - var10000 = WorldMapLabel.field233[var0][var1]; - var10000[var2 + 1] |= 1170; - var10000 = WorldMapLabel.field233[var0][var1 + 1]; - var10000[var2] |= 585; - } else if (var4 == 2) { - var10000 = WorldMapLabel.field233[var0][var1 + 1]; - var10000[var2] |= 585; - var10000 = WorldMapLabel.field233[var0][var1]; - var10000[var2] |= 1170; - } else if (var4 == 3) { - var10000 = WorldMapLabel.field233[var0][var1]; - var10000[var2] |= 1170; - var10000 = WorldMapLabel.field233[var0][var1]; - var10000[var2] |= 585; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3614(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method3124(var0, var1, var2, var8.int2); - } - - } else if (var5 == 3) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(3, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var22, (Entity)null, Tiles.field506[var4], 0, var19, var21); - if (var8.clipped) { - if (var4 == 0) { - class51.field423[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { - class51.field423[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { - class51.field423[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { - class51.field423[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3614(var1, var2, var5, var4, var8.boolean1); - } - - } else if (var5 == 9) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(var5, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.method3242(var0, var1, var2, var16, 1, 1, (Entity)var22, 0, var19, var21); - if (var8.interactType != 0 && var7 != null) { - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method3124(var0, var1, var2, var8.int2); - } - - } else if (var5 == 4) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(4, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var22, (Entity)null, Tiles.field505[var4], 0, 0, 0, var19, var21); - } else { - long var31; - Object var33; - if (var5 == 5) { - var28 = 16; - var31 = var6.getBoundaryObjectTag(var0, var1, var2); - if (var31 != 0L) { - var28 = Occluder.getObjectDefinition(ItemContainer.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.field505[var4], 0, var28 * Tiles.field507[var4], var28 * Tiles.field508[var4], var19, var21); - } else if (var5 == 6) { - var28 = 8; - var31 = var6.getBoundaryObjectTag(var0, var1, var2); - if (0L != var31) { - var28 = Occluder.getObjectDefinition(ItemContainer.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.field509[var4], var28 * Tiles.field513[var4], var19, var21); - } else if (var5 == 7) { - var23 = var4 + 2 & 3; - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(4, var23 + 4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, 4, var23 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var22, (Entity)null, 256, var23, 0, 0, var19, var21); - } else if (var5 == 8) { - var28 = 8; - var31 = var6.getBoundaryObjectTag(var0, var1, var2); - if (var31 != 0L) { - var28 = Occluder.getObjectDefinition(ItemContainer.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.field509[var4], var28 * Tiles.field513[var4], var19, var21); - } - } - } - } else { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(10, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - if (var22 != null && var6.method3242(var0, var1, var2, var16, var9, var10, (Entity)var22, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { - var23 = 15; - if (var22 instanceof Model) { - var23 = ((Model)var22).method2907() / 4; - if (var23 > 30) { - var23 = 30; - } - } - - for (int var24 = 0; var24 <= var9; ++var24) { - for (int var25 = 0; var25 <= var10; ++var25) { - if (var23 > class51.field423[var0][var24 + var1][var25 + var2]) { - class51.field423[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/Enumerated.java b/runescape-client/src/main/java/Enumerated.java index beb723f43f..b0f8abe774 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("gy") +@ObfuscatedName("gz") @Implements("Enumerated") public interface Enumerated { - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "7" + garbageValue = "-57" ) @Export("rsOrdinal") int rsOrdinal(); diff --git a/runescape-client/src/main/java/EvictingDualNodeHashTable.java b/runescape-client/src/main/java/EvictingDualNodeHashTable.java index 0f98a4b759..530b7598d1 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("ef") +@ObfuscatedName("eb") @Implements("EvictingDualNodeHashTable") public final class EvictingDualNodeHashTable { - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lfn;" - ) - DualNode field1949; @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "Lgw;" + ) + DualNode field1974; + @ObfuscatedName("i") @Export("capacity") int capacity; - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("remainingCapacity") int remainingCapacity; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Llb;" + signature = "Llc;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Ljz;" + signature = "Lji;" ) @Export("deque") IterableDualNodeQueue deque; public EvictingDualNodeHashTable(int var1) { - this.field1949 = new DualNode(); + this.field1974 = 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("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(J)Lfn;" + signature = "(J)Lgw;" ) @Export("get") public DualNode get(long var1) { @@ -57,7 +57,7 @@ public final class EvictingDualNodeHashTable { return var3; } - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("remove") public void remove(long var1) { DualNode var3 = (DualNode)this.hashTable.get(var1); @@ -69,9 +69,9 @@ public final class EvictingDualNodeHashTable { } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Lfn;J)V" + signature = "(Lgw;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.field1949) { + if (var4 == this.field1974) { var4 = this.deque.removeLast(); var4.remove(); var4.removeDual(); @@ -92,12 +92,12 @@ public final class EvictingDualNodeHashTable { this.deque.add(var1); } - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("clear") public void clear() { this.deque.clear(); this.hashTable.clear(); - this.field1949 = new DualNode(); + this.field1974 = 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 f9cd5663cb..1882113aab 100644 --- a/runescape-client/src/main/java/FaceNormal.java +++ b/runescape-client/src/main/java/FaceNormal.java @@ -2,32 +2,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("ea") +@ObfuscatedName("es") @Implements("FaceNormal") public class FaceNormal { - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "Lgz;" - ) - @Export("midiPcmStream") - public static MidiPcmStream midiPcmStream; - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -133317529 + intValue = 2144913037 ) @Export("x") int x; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -328773159 + intValue = 2071532839 ) @Export("y") int y; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -138913585 + intValue = 1947716121 ) @Export("z") int z; diff --git a/runescape-client/src/main/java/FileSystem.java b/runescape-client/src/main/java/FileSystem.java index b3c2061019..c6af238642 100644 --- a/runescape-client/src/main/java/FileSystem.java +++ b/runescape-client/src/main/java/FileSystem.java @@ -1,20 +1,15 @@ -import java.io.File; import java.util.Hashtable; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fr") +@ObfuscatedName("fg") @Implements("FileSystem") public class FileSystem { - @ObfuscatedName("u") - @Export("FileSystem_hasPermissions") - public static boolean FileSystem_hasPermissions; @ObfuscatedName("f") - @Export("FileSystem_cacheDir") - public static File FileSystem_cacheDir; - @ObfuscatedName("b") + @Export("FileSystem_hasPermissions") + static boolean FileSystem_hasPermissions; + @ObfuscatedName("y") @Export("FileSystem_cacheFiles") static Hashtable FileSystem_cacheFiles; @@ -22,209 +17,4 @@ public class FileSystem { FileSystem_hasPermissions = false; FileSystem_cacheFiles = new Hashtable(16); } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-585871581" - ) - @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; - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "(IIIIIIB)I", - garbageValue = "46" - ) - public static int method3549(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; - } - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "([BIIIIIIILel;[Lfh;I)V", - garbageValue = "1216246502" - ) - static final void method3552(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, Scene var8, CollisionMap[] var9) { - Buffer var10 = new Buffer(var0); - int var11 = -1; - - while (true) { - int var12 = var10.method5710(); - if (var12 == 0) { - return; - } - - var11 += var12; - int var13 = 0; - - while (true) { - int var14 = var10.readUShortSmart(); - if (var14 == 0) { - break; - } - - var13 += var14 - 1; - int var15 = var13 & 63; - int var16 = var13 >> 6 & 63; - int var17 = var13 >> 12; - int var18 = var10.readUnsignedByte(); - int var19 = var18 >> 2; - int var20 = var18 & 3; - if (var17 == var4 && var16 >= var5 && var16 < var5 + 8 && var15 >= var6 && var15 < var6 + 8) { - ObjectDefinition var21 = Occluder.getObjectDefinition(var11); - int var22 = var2 + PacketWriter.method2292(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20); - int var23 = var3 + method3549(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20); - if (var22 > 0 && var23 > 0 && var22 < 103 && var23 < 103) { - int var24 = var1; - if ((Tiles.Tiles_renderFlags[1][var22][var23] & 2) == 2) { - var24 = var1 - 1; - } - - CollisionMap var25 = null; - if (var24 >= 0) { - var25 = var9[var24]; - } - - EnumDefinition.method4656(var1, var22, var23, var11, var20 + var7 & 3, var19, var8, var25); - } - } - } - } - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "1410165290" - ) - static int method3551(int var0) { - return (int)((Math.log((double)var0) / Interpreter.field1082 - 7.0D) * 256.0D); - } - - @ObfuscatedName("fp") - @ObfuscatedSignature( - signature = "(IIII)V", - garbageValue = "-782793212" - ) - @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("gb") - @ObfuscatedSignature( - signature = "(IIIIZI)V", - garbageValue = "444981203" - ) - @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.field880; - } else if (var5 >= 100) { - var6 = Client.field893; - } else { - var6 = (Client.field893 - Client.field880) * var5 / 100 + Client.field880; - } - - int var7 = var3 * var6 * 512 / (var2 * 334); - int var8; - int var9; - short var10; - if (var7 < Client.field785) { - var10 = Client.field785; - var6 = var10 * var2 * 334 / (var3 * 512); - if (var6 > Client.field897) { - var6 = Client.field897; - 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.field679) { - var10 = Client.field679; - var6 = var10 * var2 * 334 / (var3 * 512); - if (var6 < Client.field896) { - var6 = Client.field896; - 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) { - WorldMapManager.method676(var2, var3); - } - - Client.viewportOffsetX = var0; - Client.viewportOffsetY = var1; - Client.viewportWidth = var2; - Client.viewportHeight = var3; - } } diff --git a/runescape-client/src/main/java/FillMode.java b/runescape-client/src/main/java/FillMode.java index 48451bc3ca..bba6d2cb23 100644 --- a/runescape-client/src/main/java/FillMode.java +++ b/runescape-client/src/main/java/FillMode.java @@ -4,41 +4,35 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lz") +@ObfuscatedName("lg") @Implements("FillMode") public enum FillMode implements Enumerated { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Llz;" + signature = "Llg;" ) @Export("SOLID") SOLID(0, 0), - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Llz;" + signature = "Llg;" ) - field3854(1, 1), - @ObfuscatedName("b") + field3850(1, 1), + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Llz;" + signature = "Llg;" ) - field3855(2, 2); + field3853(2, 2); @ObfuscatedName("w") - @Export("SpriteBuffer_pixels") - static byte[][] SpriteBuffer_pixels; - @ObfuscatedName("l") - @Export("BZip2Decompressor_block") - static int[] BZip2Decompressor_block; - @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 80643323 + intValue = -1693216809 ) @Export("value") public final int value; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1639591945 + intValue = -19931109 ) @Export("id") final int id; @@ -48,13 +42,22 @@ public enum FillMode implements Enumerated { this.id = var4; } - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "7" + garbageValue = "-57" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } + + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "(Lhz;I)V", + garbageValue = "-1700551628" + ) + public static void method6117(AbstractArchive var0) { + FloorOverlayDefinition.FloorOverlayDefinition_archive = var0; + } } diff --git a/runescape-client/src/main/java/FloorDecoration.java b/runescape-client/src/main/java/FloorDecoration.java index 7adcc90cf8..1e1e06babf 100644 --- a/runescape-client/src/main/java/FloorDecoration.java +++ b/runescape-client/src/main/java/FloorDecoration.java @@ -7,80 +7,49 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("du") @Implements("FloorDecoration") public final class FloorDecoration { - @ObfuscatedName("h") + @ObfuscatedName("ds") @ObfuscatedSignature( - signature = "[[Lhl;" + signature = "Lif;" ) - @Export("Widget_interfaceComponents") - public static Widget[][] Widget_interfaceComponents; - @ObfuscatedName("hj") + @Export("archive4") + static Archive archive4; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -787534095 - ) - @Export("cameraZ") - static int cameraZ; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 1000348855 + intValue = -813492053 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -2093523795 + intValue = -508707057 ) @Export("x") int x; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -512662577 + intValue = 1453565009 ) @Export("y") int y; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lee;" + signature = "Lep;" ) @Export("entity") public Entity entity; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedGetter( - longValue = -2591467341780492125L + longValue = 5434856025712210831L ) @Export("tag") public long tag; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 424120209 + intValue = -1187671267 ) @Export("flags") int flags; FloorDecoration() { } - - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "(CI)Z", - garbageValue = "-345109095" - ) - @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; - } - } - - @ObfuscatedName("fe") - @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "3" - ) - static int method2888(int var0) { - return var0 * 3 + 600; - } } diff --git a/runescape-client/src/main/java/FloorOverlayDefinition.java b/runescape-client/src/main/java/FloorOverlayDefinition.java index e7ee9c175d..d13f9baea4 100644 --- a/runescape-client/src/main/java/FloorOverlayDefinition.java +++ b/runescape-client/src/main/java/FloorOverlayDefinition.java @@ -4,80 +4,75 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ii") +@ObfuscatedName("ib") @Implements("FloorOverlayDefinition") public class FloorOverlayDefinition extends DualNode { - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lhf;" - ) - @Export("FloorOverlayDefinition_archive") - public static AbstractArchive FloorOverlayDefinition_archive; @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lef;" + signature = "Lhz;" + ) + @Export("FloorOverlayDefinition_archive") + static AbstractArchive FloorOverlayDefinition_archive; + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "Leb;" ) @Export("FloorOverlayDefinition_cached") static EvictingDualNodeHashTable FloorOverlayDefinition_cached; - @ObfuscatedName("jk") - @ObfuscatedSignature( - signature = "Lhl;" - ) - static Widget field3507; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1374985713 + intValue = 946777937 ) @Export("primaryRgb") public int primaryRgb; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -2103886801 + intValue = -554828149 ) @Export("texture") public int texture; - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("hideUnderlay") public boolean hideUnderlay; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1548545133 + intValue = 1736494727 ) @Export("secondaryRgb") public int secondaryRgb; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -2117743259 + intValue = 2036887063 ) @Export("hue") public int hue; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 259844631 + intValue = 636469013 ) @Export("saturation") public int saturation; - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1486642951 + intValue = 2078445359 ) @Export("lightness") public int lightness; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1953195007 + intValue = -906220363 ) @Export("secondaryHue") public int secondaryHue; - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1833494779 + intValue = -484926363 ) @Export("secondarySaturation") public int secondarySaturation; - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1532984689 + intValue = -234627479 ) @Export("secondaryLightness") public int secondaryLightness; @@ -93,10 +88,10 @@ public class FloorOverlayDefinition extends DualNode { this.secondaryRgb = -1; } - @ObfuscatedName("f") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1381729137" + signature = "(B)V", + garbageValue = "-50" ) @Export("postDecode") void postDecode() { @@ -110,10 +105,10 @@ public class FloorOverlayDefinition extends DualNode { this.setHsl(this.primaryRgb); } - @ObfuscatedName("b") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lkg;II)V", - garbageValue = "-157824233" + signature = "(Lkq;IB)V", + garbageValue = "-31" ) @Export("decode") void decode(Buffer var1, int var2) { @@ -127,10 +122,10 @@ public class FloorOverlayDefinition extends DualNode { } } - @ObfuscatedName("g") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Lkg;III)V", - garbageValue = "-2104384515" + signature = "(Lkq;IIB)V", + garbageValue = "1" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { @@ -147,10 +142,10 @@ public class FloorOverlayDefinition extends DualNode { } - @ObfuscatedName("z") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-1137503330" + signature = "(IB)V", + garbageValue = "49" ) @Export("setHsl") void setHsl(int var1) { @@ -178,7 +173,7 @@ public class FloorOverlayDefinition extends DualNode { double var12 = 0.0D; double var14 = 0.0D; double var16 = (var8 + var10) / 2.0D; - if (var10 != var8) { + if (var8 != var10) { if (var16 < 0.5D) { var14 = (var10 - var8) / (var10 + var8); } @@ -189,16 +184,16 @@ public class FloorOverlayDefinition extends DualNode { if (var2 == var10) { var12 = (var4 - var6) / (var10 - var8); - } else if (var4 == var10) { - var12 = (var6 - var2) / (var10 - var8) + 2.0D; + } else if (var10 == var4) { + var12 = 2.0D + (var6 - var2) / (var10 - var8); } else if (var6 == var10) { - var12 = 4.0D + (var2 - var4) / (var10 - var8); + var12 = (var2 - var4) / (var10 - var8) + 4.0D; } } var12 /= 6.0D; - this.hue = (int)(256.0D * var12); - this.saturation = (int)(var14 * 256.0D); + this.hue = (int)(var12 * 256.0D); + this.saturation = (int)(256.0D * var14); this.lightness = (int)(var16 * 256.0D); if (this.saturation < 0) { this.saturation = 0; @@ -214,18 +209,59 @@ public class FloorOverlayDefinition extends DualNode { } - @ObfuscatedName("k") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "([BI)Lky;", - garbageValue = "1533965281" + signature = "(CLgs;B)I", + garbageValue = "-103" ) - static Font method4853(byte[] var0) { - if (var0 == null) { - return null; - } else { - Font var1 = new Font(var0, UrlRequester.SpriteBuffer_xOffsets, class216.SpriteBuffer_yOffsets, class325.SpriteBuffer_spriteWidths, VarcInt.SpriteBuffer_spriteHeights, class325.SpriteBuffer_spritePalette, FillMode.SpriteBuffer_pixels); - PcmPlayer.method2510(); - return var1; + @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("ji") + @ObfuscatedSignature( + signature = "([Lha;IIIZB)V", + garbageValue = "48" + ) + @Export("resizeInterface") + static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) { + for (int var5 = 0; var5 < var0.length; ++var5) { + Widget var6 = var0[var5]; + if (var6 != null && var6.parentId == var1) { + class32.alignWidgetSize(var6, var2, var3, var4); + class2.alignWidgetPosition(var6, var2, var3); + if (var6.scrollX > var6.scrollWidth - var6.width) { + var6.scrollX = var6.scrollWidth - var6.width; + } + + 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) { + Messages.revalidateWidgetScroll(var0, var6, var4); + } + } + } + } } diff --git a/runescape-client/src/main/java/FloorUnderlayDefinition.java b/runescape-client/src/main/java/FloorUnderlayDefinition.java index ae89edca6c..c1f51c465d 100644 --- a/runescape-client/src/main/java/FloorUnderlayDefinition.java +++ b/runescape-client/src/main/java/FloorUnderlayDefinition.java @@ -4,48 +4,48 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ig") +@ObfuscatedName("iy") @Implements("FloorUnderlayDefinition") public class FloorUnderlayDefinition extends DualNode { - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lhf;" - ) - @Export("FloorUnderlayDefinition_archive") - public static AbstractArchive FloorUnderlayDefinition_archive; @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lef;" + signature = "Lhz;" + ) + @Export("FloorUnderlayDefinition_archive") + static AbstractArchive FloorUnderlayDefinition_archive; + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "Leb;" ) @Export("FloorUnderlayDefinition_cached") - static EvictingDualNodeHashTable FloorUnderlayDefinition_cached; - @ObfuscatedName("b") + public static EvictingDualNodeHashTable FloorUnderlayDefinition_cached; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1990790849 + intValue = -1172468213 ) @Export("rgb") int rgb; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 950733239 + intValue = -1800958439 ) @Export("hue") public int hue; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1331768767 + intValue = -217803579 ) @Export("saturation") public int saturation; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1638943331 + intValue = 1888954087 ) @Export("lightness") public int lightness; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -49620877 + intValue = 1484017615 ) @Export("hueMultiplier") public int hueMultiplier; @@ -58,20 +58,20 @@ public class FloorUnderlayDefinition extends DualNode { this.rgb = 0; } - @ObfuscatedName("f") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1444888846" + garbageValue = "47336247" ) @Export("postDecode") void postDecode() { this.setHsl(this.rgb); } - @ObfuscatedName("b") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lkg;IB)V", - garbageValue = "-99" + signature = "(Lkq;II)V", + garbageValue = "790135935" ) @Export("decode") void decode(Buffer var1, int var2) { @@ -85,10 +85,10 @@ public class FloorUnderlayDefinition extends DualNode { } } - @ObfuscatedName("g") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Lkg;III)V", - garbageValue = "-1897870876" + signature = "(Lkq;III)V", + garbageValue = "-1066801871" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { @@ -98,10 +98,10 @@ public class FloorUnderlayDefinition extends DualNode { } - @ObfuscatedName("z") + @ObfuscatedName("b") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-2026180735" + garbageValue = "395351662" ) @Export("setHsl") void setHsl(int var1) { @@ -138,7 +138,7 @@ public class FloorUnderlayDefinition extends DualNode { var14 = (var10 - var8) / (2.0D - var10 - var8); } - if (var2 == var10) { + if (var10 == var2) { var12 = (var4 - var6) / (var10 - var8); } else if (var4 == var10) { var12 = 2.0D + (var6 - var2) / (var10 - var8); @@ -148,8 +148,8 @@ public class FloorUnderlayDefinition extends DualNode { } var12 /= 6.0D; - this.saturation = (int)(256.0D * var14); - this.lightness = (int)(var16 * 256.0D); + this.saturation = (int)(var14 * 256.0D); + this.lightness = (int)(256.0D * var16); if (this.saturation < 0) { this.saturation = 0; } else if (this.saturation > 255) { @@ -165,13 +165,23 @@ public class FloorUnderlayDefinition extends DualNode { if (var16 > 0.5D) { this.hueMultiplier = (int)((1.0D - var16) * var14 * 512.0D); } else { - this.hueMultiplier = (int)(512.0D * var14 * var16); + this.hueMultiplier = (int)(var16 * var14 * 512.0D); } if (this.hueMultiplier < 1) { this.hueMultiplier = 1; } - this.hue = (int)(var12 * (double)this.hueMultiplier); + this.hue = (int)((double)this.hueMultiplier * var12); + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(Lhz;III)Lls;", + garbageValue = "-1136853521" + ) + @Export("SpriteBuffer_getSprite") + public static Sprite SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { + return !HitSplatDefinition.method4586(var0, var1, var2) ? null : Buffer.method5689(); } } diff --git a/runescape-client/src/main/java/Font.java b/runescape-client/src/main/java/Font.java index 8a3482aed2..4497a331ce 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("ky") +@ObfuscatedName("ko") @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("u") + @ObfuscatedName("f") @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("f") + @ObfuscatedName("i") @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 8dced08124..ce0a0f769f 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -3,52 +3,46 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ka") +@ObfuscatedName("kk") @Implements("FontName") public class FontName { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lka;" + signature = "Lkk;" ) @Export("FontName_plain11") public static final FontName FontName_plain11; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lka;" + signature = "Lkk;" ) @Export("FontName_plain12") public static final FontName FontName_plain12; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lka;" + signature = "Lkk;" ) @Export("FontName_bold12") public static final FontName FontName_bold12; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lka;" + signature = "Lkk;" ) @Export("FontName_verdana11") public static final FontName FontName_verdana11; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lka;" + signature = "Lkk;" ) @Export("FontName_verdana13") public static final FontName FontName_verdana13; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "Lka;" + signature = "Lkk;" ) @Export("FontName_verdana15") public static final FontName FontName_verdana15; - @ObfuscatedName("gg") - @ObfuscatedSignature( - signature = "[Lln;" - ) - @Export("headIconPkSprites") - static Sprite[] headIconPkSprites; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("name") String name; @@ -65,233 +59,35 @@ public class FontName { this.name = var1; } - @ObfuscatedName("u") + @ObfuscatedName("az") @ObfuscatedSignature( - signature = "(Ljava/lang/Object;ZB)[B", - garbageValue = "-6" + signature = "(Lig;B)Z", + garbageValue = "9" ) - @Export("serialize") - public static byte[] serialize(Object var0, boolean var1) { - if (var0 == null) { - return null; - } else if (var0 instanceof byte[]) { - byte[] var3 = (byte[])((byte[])var0); - return var1 ? ObjectSound.method1935(var3) : var3; - } else if (var0 instanceof AbstractByteArrayCopier) { - AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; - return var2.get(); - } else { - throw new IllegalArgumentException(); + static boolean method5377(ObjectDefinition var0) { + if (var0.transforms != null) { + int[] var1 = var0.transforms; + + for (int var2 = 0; var2 < var1.length; ++var2) { + int var3 = var1[var2]; + ObjectDefinition var4 = Coord.getObjectDefinition(var3); + if (var4.mapIconId != -1) { + return true; + } + } + } else if (var0.mapIconId != -1) { + return true; } + + return false; } - @ObfuscatedName("u") + @ObfuscatedName("lc") @ObfuscatedSignature( - signature = "([Ljava/lang/CharSequence;IIS)Ljava/lang/String;", - garbageValue = "11835" + signature = "(IB)V", + garbageValue = "-46" ) - public static String method5425(CharSequence[] var0, int var1, int var2) { - if (var2 == 0) { - return ""; - } else if (var2 == 1) { - CharSequence var3 = var0[var1]; - return var3 == null ? "null" : var3.toString(); - } else { - int var8 = var2 + var1; - int var4 = 0; - - for (int var5 = var1; var5 < var8; ++var5) { - CharSequence var6 = var0[var5]; - if (var6 == null) { - var4 += 4; - } else { - var4 += var6.length(); - } - } - - StringBuilder var9 = new StringBuilder(var4); - - for (int var10 = var1; var10 < var8; ++var10) { - CharSequence var7 = var0[var10]; - if (var7 == null) { - var9.append("null"); - } else { - var9.append(var7); - } - } - - return var9.toString(); - } - } - - @ObfuscatedName("gw") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1549507676" - ) - static void method5427() { - if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { - Varcs.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); - } - - } - - @ObfuscatedName("gr") - @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "-310614097" - ) - static final void method5426(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 == class215.localPlayer) { - var6 = var9; - continue; - } - } else { - var10 = Client.npcs[Client.npcIndices[var9 - var7]]; - } - - class80.drawActor2d((Actor)var10, var9, var0, var1, var2, var3); - } - - if (Client.renderSelf && var6 != -1) { - class80.drawActor2d(class215.localPlayer, var6, var0, var1, var2, var3); - } - - if (var4) { - class80.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var5, var0, var1, var2, var3); - } - - for (var9 = 0; var9 < Client.overheadTextCount; ++var9) { - int var19 = Client.overheadTextXs[var9]; - int var11 = Client.overheadTextYs[var9]; - int var12 = Client.overheadTextXOffsets[var9]; - int var13 = Client.overheadTextAscents[var9]; - boolean var14 = true; - - while (var14) { - var14 = false; - - for (int var15 = 0; var15 < var9; ++var15) { - if (var11 + 2 > Client.overheadTextYs[var15] - Client.overheadTextAscents[var15] && var11 - var13 < Client.overheadTextYs[var15] + 2 && var19 - var12 < Client.overheadTextXOffsets[var15] + Client.overheadTextXs[var15] && var19 + var12 > Client.overheadTextXs[var15] - Client.overheadTextXOffsets[var15] && Client.overheadTextYs[var15] - Client.overheadTextAscents[var15] < var11) { - var11 = Client.overheadTextYs[var15] - Client.overheadTextAscents[var15]; - var14 = true; - } - } - } - - Client.viewportTempX = Client.overheadTextXs[var9]; - Client.viewportTempY = Client.overheadTextYs[var9] = var11; - String var20 = Client.overheadText[var9]; - if (Client.chatEffects == 0) { - int var16 = 16776960; - if (Client.overheadTextColors[var9] < 6) { - var16 = Client.field857[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) { - JagexCache.fontBold12.drawCentered(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0); - } - - if (Client.overheadTextEffects[var9] == 1) { - JagexCache.fontBold12.drawCenteredWave(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); - } - - if (Client.overheadTextEffects[var9] == 2) { - JagexCache.fontBold12.drawCenteredWave2(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); - } - - if (Client.overheadTextEffects[var9] == 3) { - JagexCache.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]) * (JagexCache.fontBold12.stringWidth(var20) + 100) / 150; - Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); - JagexCache.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 - JagexCache.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); - JagexCache.fontBold12.drawCentered(var20, var0 + Client.viewportTempX, var18 + Client.viewportTempY + var1, var16, 0); - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); - } - } else { - JagexCache.fontBold12.drawCentered(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); - } - } - + static void method5376(int var0) { + Client.oculusOrbState = var0; } } diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java index dab03a7179..a4be686359 100644 --- a/runescape-client/src/main/java/Fonts.java +++ b/runescape-client/src/main/java/Fonts.java @@ -4,27 +4,27 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kf") +@ObfuscatedName("ki") @Implements("Fonts") public class Fonts { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lhf;" + signature = "Lhz;" ) @Export("spritesArchive") AbstractArchive spritesArchive; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lhf;" + signature = "Lhz;" ) @Export("fontsArchive") AbstractArchive fontsArchive; - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("map") HashMap map; @ObfuscatedSignature( - signature = "(Lhf;Lhf;)V" + signature = "(Lhz;Lhz;)V" ) public Fonts(AbstractArchive var1, AbstractArchive var2) { this.spritesArchive = var1; @@ -32,10 +32,10 @@ public class Fonts { this.map = new HashMap(); } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "([Lka;B)Ljava/util/HashMap;", - garbageValue = "35" + signature = "([Lkk;I)Ljava/util/HashMap;", + garbageValue = "-819608021" ) @Export("createMap") public HashMap createMap(FontName[] var1) { @@ -47,12 +47,7 @@ public class Fonts { if (this.map.containsKey(var5)) { var2.put(var5, this.map.get(var5)); } else { - AbstractArchive var7 = this.spritesArchive; - AbstractArchive var8 = this.fontsArchive; - String var9 = var5.name; - int var10 = var7.getGroupId(var9); - int var11 = var7.getFileId(var10, ""); - Font var6 = class60.method1195(var7, var8, var10, var11); + Font var6 = ArchiveDisk.method5909(this.spritesArchive, this.fontsArchive, var5.name, ""); if (var6 != null) { this.map.put(var5, var6); var2.put(var5, var6); @@ -62,42 +57,4 @@ public class Fonts { return var2; } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "([Ljava/lang/String;[SIII)V", - garbageValue = "-1903452094" - ) - @Export("sortItemsByName") - static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) { - if (var2 < var3) { - int var4 = (var3 + var2) / 2; - int var5 = var2; - String var6 = var0[var4]; - var0[var4] = var0[var3]; - var0[var3] = var6; - short var7 = var1[var4]; - var1[var4] = var1[var3]; - var1[var3] = var7; - - for (int var8 = var2; var8 < var3; ++var8) { - if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { - String var9 = var0[var8]; - var0[var8] = var0[var5]; - var0[var5] = var9; - short var10 = var1[var8]; - var1[var8] = var1[var5]; - var1[var5++] = var10; - } - } - - var0[var3] = var0[var5]; - var0[var5] = var6; - var1[var3] = var1[var5]; - var1[var5] = var7; - sortItemsByName(var0, var1, var2, var5 - 1); - sortItemsByName(var0, var1, var5 + 1, var3); - } - - } } diff --git a/runescape-client/src/main/java/Frames.java b/runescape-client/src/main/java/Frames.java index fcc2378511..055ad4b8a8 100644 --- a/runescape-client/src/main/java/Frames.java +++ b/runescape-client/src/main/java/Frames.java @@ -1,29 +1,20 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("er") +@ObfuscatedName("eq") @Implements("Frames") public class Frames extends DualNode { - @ObfuscatedName("b") - @Export("Interpreter_intLocals") - static int[] Interpreter_intLocals; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 1770537973 - ) - static int field1880; - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "[Ldg;" + signature = "[Ldj;" ) @Export("frames") Animation[] frames; @ObfuscatedSignature( - signature = "(Lhf;Lhf;IZ)V", + signature = "(Lhz;Lhz;IZ)V", garbageValue = "0" ) public Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { @@ -55,475 +46,234 @@ public class Frames extends DualNode { } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "-1990783363" + garbageValue = "-996338531" ) @Export("hasAlphaTransform") public boolean hasAlphaTransform(int var1) { return this.frames[var1].hasAlphaTransform; } + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-360173892" + ) + static void method3280() { + if (Login.field1173) { + Login.titleboxSprite = null; + Login.titlebuttonSprite = null; + Login.runesSprite = null; + UrlRequest.leftTitleSprite = null; + ScriptFrame.rightTitleSprite = null; + Login.logoSprite = null; + class30.title_muteSprite = null; + class218.options_buttons_0Sprite = null; + Login.options_buttons_2Sprite = null; + Calendar.worldSelectBackSprites = null; + AbstractWorldMapIcon.worldSelectFlagSprites = null; + Message.worldSelectArrows = null; + SpotAnimationDefinition.worldSelectStars = null; + class54.field483 = null; + StructDefinition.loginScreenRunesAnimation.method1812(); + BoundaryObject.method3273(2); + BuddyRankComparator.method3362(true); + Login.field1173 = false; + } + } + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Lel;[Lfh;B)V", - garbageValue = "-55" + signature = "(ILcu;ZB)I", + garbageValue = "43" ) - static final void method3319(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; - } + static int method3281(int var0, Script var1, boolean var2) { + if (var0 < 1000) { + return WorldMapManager.method656(var0, var1, var2); + } else if (var0 < 1100) { + return class60.method1170(var0, var1, var2); + } else if (var0 < 1200) { + return MidiPcmStream.method3737(var0, var1, var2); + } else if (var0 < 1300) { + return Friend.method5286(var0, var1, var2); + } else if (var0 < 1400) { + return UrlRequester.method3306(var0, var1, var2); + } else if (var0 < 1500) { + return GrandExchangeOfferNameComparator.method134(var0, var1, var2); + } else if (var0 < 1600) { + return class2.method34(var0, var1, var2); + } else if (var0 < 1700) { + return ServerPacket.method3568(var0, var1, var2); + } else if (var0 < 1800) { + return UserList.method5193(var0, var1, var2); + } else if (var0 < 1900) { + return ServerPacket.method3569(var0, var1, var2); + } else if (var0 < 2000) { + return LoginPacket.method3575(var0, var1, var2); + } else if (var0 < 2100) { + return class60.method1170(var0, var1, var2); + } else if (var0 < 2200) { + return MidiPcmStream.method3737(var0, var1, var2); + } else if (var0 < 2300) { + return Friend.method5286(var0, var1, var2); + } else if (var0 < 2400) { + return UrlRequester.method3306(var0, var1, var2); + } else if (var0 < 2500) { + return GrandExchangeOfferNameComparator.method134(var0, var1, var2); + } else if (var0 < 2600) { + return class219.method4077(var0, var1, var2); + } else if (var0 < 2700) { + return WorldMapAreaData.method692(var0, var1, var2); + } else if (var0 < 2800) { + return GameShell.method1068(var0, var1, var2); + } else if (var0 < 2900) { + return class32.method559(var0, var1, var2); + } else if (var0 < 3000) { + return LoginPacket.method3575(var0, var1, var2); + } else if (var0 < 3200) { + return AbstractArchive.method4166(var0, var1, var2); + } else if (var0 < 3300) { + return AbstractByteArrayCopier.method3937(var0, var1, var2); + } else if (var0 < 3400) { + return class206.method3919(var0, var1, var2); + } else if (var0 < 3500) { + return DevicePcmPlayerProvider.method840(var0, var1, var2); + } else if (var0 < 3700) { + return MenuAction.method2069(var0, var1, var2); + } else if (var0 < 4000) { + return ScriptFrame.method1111(var0, var1, var2); + } else if (var0 < 4100) { + return GrandExchangeEvents.method72(var0, var1, var2); + } else if (var0 < 4200) { + return class60.method1171(var0, var1, var2); + } else if (var0 < 4300) { + return ScriptFrame.method1112(var0, var1, var2); + } else if (var0 < 5100) { + return Tiles.method1144(var0, var1, var2); + } else if (var0 < 5400) { + return UserComparator6.method3369(var0, var1, var2); + } else if (var0 < 5600) { + return VarpDefinition.method4347(var0, var1, var2); + } else if (var0 < 5700) { + return UserComparator7.method3345(var0, var1, var2); + } else if (var0 < 6300) { + return Player.method1277(var0, var1, var2); + } else if (var0 < 6600) { + return AbstractWorldMapData.method272(var0, var1, var2); + } else { + return var0 < 6700 ? WorldMapRectangle.method273(var0, var1, var2) : 2; + } + } - if (var5 >= 0) { - var1[var5].setBlockedByFloor(var3, var4); - } - } - } - } + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "(II)I", + garbageValue = "-1767342490" + ) + @Export("iLog") + public static int iLog(int var0) { + int var1 = 0; + if (var0 < 0 || var0 >= 65536) { + var0 >>>= 16; + var1 += 16; } - Tiles.field511 += (int)(Math.random() * 5.0D) - 2; - if (Tiles.field511 < -8) { - Tiles.field511 = -8; + if (var0 >= 256) { + var0 >>>= 8; + var1 += 8; } - if (Tiles.field511 > 8) { - Tiles.field511 = 8; + if (var0 >= 16) { + var0 >>>= 4; + var1 += 4; } - Tiles.field503 += (int)(Math.random() * 5.0D) - 2; - if (Tiles.field503 < -16) { - Tiles.field503 = -16; + if (var0 >= 4) { + var0 >>>= 2; + var1 += 2; } - if (Tiles.field503 > 16) { - Tiles.field503 = 16; + if (var0 >= 1) { + var0 >>>= 1; + ++var1; } + return var0 + var1; + } + + @ObfuscatedName("gl") + @ObfuscatedSignature( + signature = "(IIIIZB)V", + garbageValue = "36" + ) + @Export("setViewportShape") + static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { + if (var2 < 1) { + var2 = 1; + } + + if (var3 < 1) { + var3 = 1; + } + + int var5 = var3 - 334; + int var6; + if (var5 < 0) { + var6 = Client.field879; + } else if (var5 >= 100) { + var6 = Client.field880; + } else { + var6 = (Client.field880 - Client.field879) * var5 / 100 + Client.field879; + } + + int var7 = var3 * var6 * 512 / (var2 * 334); + int var8; int var9; - int var10; - int var11; - int var12; - int var13; - int var14; - int var15; - int var16; - int[] var10000; - int var17; - int var18; - for (var2 = 0; var2 < 4; ++var2) { - byte[][] var42 = class51.field423[var2]; - var9 = (int)Math.sqrt(5100.0D); - var10 = var9 * 768 >> 8; - - int var19; - int var20; - for (var11 = 1; var11 < 103; ++var11) { - for (var12 = 1; var12 < 103; ++var12) { - var13 = Tiles.Tiles_heights[var2][var12 + 1][var11] - Tiles.Tiles_heights[var2][var12 - 1][var11]; - var14 = Tiles.Tiles_heights[var2][var12][var11 + 1] - Tiles.Tiles_heights[var2][var12][var11 - 1]; - var15 = (int)Math.sqrt((double)(var14 * var14 + var13 * var13 + 65536)); - var16 = (var13 << 8) / var15; - var17 = 65536 / var15; - var18 = (var14 << 8) / var15; - var19 = (var16 * -50 + var18 * -50 + var17 * -10) / var10 + 96; - var20 = (var42[var12 - 1][var11] >> 2) + (var42[var12][var11 - 1] >> 2) + (var42[var12 + 1][var11] >> 3) + (var42[var12][var11 + 1] >> 3) + (var42[var12][var11] >> 1); - Login.field1207[var12][var11] = var19 - var20; + short var10; + if (var7 < Client.field804) { + var10 = Client.field804; + var6 = var10 * var2 * 334 / (var3 * 512); + if (var6 > Client.field884) { + var6 = Client.field884; + var8 = var3 * var6 * 512 / (var10 * 334); + var9 = (var2 - var8) / 2; + if (var4) { + Rasterizer2D.Rasterizer2D_resetClip(); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); + Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); } + + var0 += var9; + var2 -= var9 * 2; } - - for (var11 = 0; var11 < 104; ++var11) { - Tiles.Tiles_hue[var11] = 0; - Tiles.Tiles_saturation[var11] = 0; - Tiles.Tiles_lightness[var11] = 0; - class290.Tiles_hueMultiplier[var11] = 0; - MouseRecorder.field588[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.field498[var2][var13][var12] & 255; - if (var14 > 0) { - FloorUnderlayDefinition var43 = WallDecoration.method3339(var14 - 1); - var10000 = Tiles.Tiles_hue; - var10000[var12] += var43.hue; - var10000 = Tiles.Tiles_saturation; - var10000[var12] += var43.saturation; - var10000 = Tiles.Tiles_lightness; - var10000[var12] += var43.lightness; - var10000 = class290.Tiles_hueMultiplier; - var10000[var12] += var43.hueMultiplier; - var10002 = MouseRecorder.field588[var12]++; - } - } - - var14 = var11 - 5; - if (var14 >= 0 && var14 < 104) { - var15 = Tiles.field498[var2][var14][var12] & 255; - if (var15 > 0) { - FloorUnderlayDefinition var45 = WallDecoration.method3339(var15 - 1); - var10000 = Tiles.Tiles_hue; - var10000[var12] -= var45.hue; - var10000 = Tiles.Tiles_saturation; - var10000[var12] -= var45.saturation; - var10000 = Tiles.Tiles_lightness; - var10000[var12] -= var45.lightness; - var10000 = class290.Tiles_hueMultiplier; - var10000[var12] -= var45.hueMultiplier; - var10002 = MouseRecorder.field588[var12]--; - } - } + } else if (var7 > Client.field886) { + var10 = Client.field886; + var6 = var10 * var2 * 334 / (var3 * 512); + if (var6 < Client.field796) { + var6 = Client.field796; + var8 = var10 * var2 * 334 / (var6 * 512); + var9 = (var3 - var8) / 2; + if (var4) { + Rasterizer2D.Rasterizer2D_resetClip(); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); } - 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 += Tiles.Tiles_saturation[var18]; - var14 += Tiles.Tiles_lightness[var18]; - var15 += class290.Tiles_hueMultiplier[var18]; - var16 += MouseRecorder.field588[var18]; - } - - var19 = var17 - 5; - if (var19 >= 0 && var19 < 104) { - var12 -= Tiles.Tiles_hue[var19]; - var13 -= Tiles.Tiles_saturation[var19]; - var14 -= Tiles.Tiles_lightness[var19]; - var15 -= class290.Tiles_hueMultiplier[var19]; - var16 -= MouseRecorder.field588[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.field498[var2][var11][var17] & 255; - int var21 = Tiles.field499[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 = Login.field1207[var11][var17]; - int var27 = Login.field1207[var11 + 1][var17]; - int var28 = Login.field1207[var11 + 1][var17 + 1]; - int var29 = Login.field1207[var11][var17 + 1]; - int var30 = -1; - int var31 = -1; - int var32; - int var33; - if (var20 > 0) { - var32 = var12 * 256 / var15; - var33 = var13 / var16; - int var34 = var14 / var16; - var30 = FriendLoginUpdate.hslToRgb(var32, var33, var34); - var32 = var32 + Tiles.field511 & 255; - var34 += Tiles.field503; - if (var34 < 0) { - var34 = 0; - } else if (var34 > 255) { - var34 = 255; - } - - var31 = FriendLoginUpdate.hslToRgb(var32, var33, var34); - } - - if (var2 > 0) { - boolean var47 = true; - if (var20 == 0 && Tiles.field500[var2][var11][var17] != 0) { - var47 = false; - } - - if (var21 > 0 && !WorldMapRectangle.FloorUnderlayDefinition_get(var21 - 1).hideUnderlay) { - var47 = false; - } - - if (var47 && var23 == var22 && var24 == var22 && var22 == var25) { - var10000 = WorldMapLabel.field233[var2][var11]; - var10000[var17] |= 2340; - } - } - - var32 = 0; - if (var31 != -1) { - var32 = Rasterizer3D.Rasterizer3D_colorPalette[TriBool.method5255(var31, 96)]; - } - - if (var21 == 0) { - var0.addTile(var2, var11, var17, 0, 0, -1, var22, var23, var24, var25, TriBool.method5255(var30, var26), TriBool.method5255(var30, var27), TriBool.method5255(var30, var28), TriBool.method5255(var30, var29), 0, 0, 0, 0, var32, 0); - } else { - var33 = Tiles.field500[var2][var11][var17] + 1; - byte var48 = Tiles.field501[var2][var11][var17]; - FloorOverlayDefinition var35 = WorldMapRectangle.FloorUnderlayDefinition_get(var21 - 1); - int var36 = var35.texture; - int var37; - int var38; - int var39; - int var40; - if (var36 >= 0) { - var38 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var36); - var37 = -1; - } else if (var35.primaryRgb == 16711935) { - var37 = -2; - var36 = -1; - var38 = -2; - } else { - var37 = FriendLoginUpdate.hslToRgb(var35.hue, var35.saturation, var35.lightness); - var39 = var35.hue + Tiles.field511 & 255; - var40 = var35.lightness + Tiles.field503; - if (var40 < 0) { - var40 = 0; - } else if (var40 > 255) { - var40 = 255; - } - - var38 = FriendLoginUpdate.hslToRgb(var39, var35.saturation, var40); - } - - var39 = 0; - if (var38 != -2) { - var39 = Rasterizer3D.Rasterizer3D_colorPalette[LoginScreenAnimation.method1832(var38, 96)]; - } - - if (var35.secondaryRgb != -1) { - var40 = var35.secondaryHue + Tiles.field511 & 255; - int var41 = var35.secondaryLightness + Tiles.field503; - if (var41 < 0) { - var41 = 0; - } else if (var41 > 255) { - var41 = 255; - } - - var38 = FriendLoginUpdate.hslToRgb(var40, var35.secondarySaturation, var41); - var39 = Rasterizer3D.Rasterizer3D_colorPalette[LoginScreenAnimation.method1832(var38, 96)]; - } - - var0.addTile(var2, var11, var17, var33, var48, var36, var22, var23, var24, var25, TriBool.method5255(var30, var26), TriBool.method5255(var30, var27), TriBool.method5255(var30, var28), TriBool.method5255(var30, var29), LoginScreenAnimation.method1832(var37, var26), LoginScreenAnimation.method1832(var37, var27), LoginScreenAnimation.method1832(var37, var28), LoginScreenAnimation.method1832(var37, var29), var32, var39); - } - } - } - } - } - } - - for (var11 = 1; var11 < 103; ++var11) { - for (var12 = 1; var12 < 103; ++var12) { - if ((Tiles.Tiles_renderFlags[var2][var12][var11] & 8) != 0) { - var17 = 0; - } else if (var2 > 0 && (Tiles.Tiles_renderFlags[1][var12][var11] & 2) != 0) { - var17 = var2 - 1; - } else { - var17 = var2; - } - - var0.setTileMinPlane(var2, var12, var11, var17); - } - } - - Tiles.field498[var2] = null; - Tiles.field499[var2] = null; - Tiles.field500[var2] = null; - Tiles.field501[var2] = null; - class51.field423[var2] = null; - } - - var0.method3165(-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); - } + var1 += var9; + var3 -= var9 * 2; } } - var2 = 1; - var3 = 2; - var4 = 4; - - for (var5 = 0; var5 < 4; ++var5) { - if (var5 > 0) { - var2 <<= 3; - var3 <<= 3; - var4 <<= 3; - } - - for (int var6 = 0; var6 <= var5; ++var6) { - for (int var7 = 0; var7 <= 104; ++var7) { - for (int var8 = 0; var8 <= 104; ++var8) { - short var46; - if ((WorldMapLabel.field233[var6][var8][var7] & var2) != 0) { - var9 = var7; - var10 = var7; - var11 = var6; - - for (var12 = var6; var9 > 0 && (WorldMapLabel.field233[var6][var8][var9 - 1] & var2) != 0; --var9) { - } - - while (var10 < 104 && (WorldMapLabel.field233[var6][var8][var10 + 1] & var2) != 0) { - ++var10; - } - - label492: - while (var11 > 0) { - for (var13 = var9; var13 <= var10; ++var13) { - if ((WorldMapLabel.field233[var11 - 1][var8][var13] & var2) == 0) { - break label492; - } - } - - --var11; - } - - label481: - while (var12 < var5) { - for (var13 = var9; var13 <= var10; ++var13) { - if ((WorldMapLabel.field233[var12 + 1][var8][var13] & var2) == 0) { - break label481; - } - } - - ++var12; - } - - var13 = (var12 + 1 - var11) * (var10 - var9 + 1); - if (var13 >= 8) { - var46 = 240; - var15 = Tiles.Tiles_heights[var12][var8][var9] - var46; - var16 = Tiles.Tiles_heights[var11][var8][var9]; - Scene.Scene_addOccluder(var5, 1, var8 * 128, var8 * 128, var9 * 128, var10 * 128 + 128, var15, var16); - - for (var17 = var11; var17 <= var12; ++var17) { - for (var18 = var9; var18 <= var10; ++var18) { - var10000 = WorldMapLabel.field233[var17][var8]; - var10000[var18] &= ~var2; - } - } - } - } - - if ((WorldMapLabel.field233[var6][var8][var7] & var3) != 0) { - var9 = var8; - var10 = var8; - var11 = var6; - - for (var12 = var6; var9 > 0 && (WorldMapLabel.field233[var6][var9 - 1][var7] & var3) != 0; --var9) { - } - - while (var10 < 104 && (WorldMapLabel.field233[var6][var10 + 1][var7] & var3) != 0) { - ++var10; - } - - label545: - while (var11 > 0) { - for (var13 = var9; var13 <= var10; ++var13) { - if ((WorldMapLabel.field233[var11 - 1][var13][var7] & var3) == 0) { - break label545; - } - } - - --var11; - } - - label534: - while (var12 < var5) { - for (var13 = var9; var13 <= var10; ++var13) { - if ((WorldMapLabel.field233[var12 + 1][var13][var7] & var3) == 0) { - break label534; - } - } - - ++var12; - } - - var13 = (var12 + 1 - var11) * (var10 - var9 + 1); - if (var13 >= 8) { - var46 = 240; - var15 = Tiles.Tiles_heights[var12][var9][var7] - var46; - var16 = Tiles.Tiles_heights[var11][var9][var7]; - Scene.Scene_addOccluder(var5, 2, var9 * 128, var10 * 128 + 128, var7 * 128, var7 * 128, var15, var16); - - for (var17 = var11; var17 <= var12; ++var17) { - for (var18 = var9; var18 <= var10; ++var18) { - var10000 = WorldMapLabel.field233[var17][var18]; - var10000[var7] &= ~var3; - } - } - } - } - - if ((WorldMapLabel.field233[var6][var8][var7] & var4) != 0) { - var9 = var8; - var10 = var8; - var11 = var7; - - for (var12 = var7; var11 > 0 && (WorldMapLabel.field233[var6][var8][var11 - 1] & var4) != 0; --var11) { - } - - while (var12 < 104 && (WorldMapLabel.field233[var6][var8][var12 + 1] & var4) != 0) { - ++var12; - } - - label598: - while (var9 > 0) { - for (var13 = var11; var13 <= var12; ++var13) { - if ((WorldMapLabel.field233[var6][var9 - 1][var13] & var4) == 0) { - break label598; - } - } - - --var9; - } - - label587: - while (var10 < 104) { - for (var13 = var11; var13 <= var12; ++var13) { - if ((WorldMapLabel.field233[var6][var10 + 1][var13] & var4) == 0) { - break label587; - } - } - - ++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) { - var10000 = WorldMapLabel.field233[var6][var14]; - var10000[var15] &= ~var4; - } - } - } - } - } - } - } + Client.viewportZoom = var3 * var6 / 334; + if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { + Language.method3634(var2, var3); } + Client.viewportOffsetX = var0; + Client.viewportOffsetY = var1; + Client.viewportWidth = var2; + Client.viewportHeight = var3; } } diff --git a/runescape-client/src/main/java/Friend.java b/runescape-client/src/main/java/Friend.java index a4a94c8bae..63305e6ad0 100644 --- a/runescape-client/src/main/java/Friend.java +++ b/runescape-client/src/main/java/Friend.java @@ -2,22 +2,23 @@ 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("jn") +@ObfuscatedName("jg") @Implements("Friend") public class Friend extends Buddy { - @ObfuscatedName("u") - boolean field3629; @ObfuscatedName("f") - boolean field3630; + boolean field3617; + @ObfuscatedName("i") + boolean field3618; Friend() { } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Ljn;I)I", - garbageValue = "-1380403624" + signature = "(Ljg;B)I", + garbageValue = "73" ) @Export("compareToFriend") int compareToFriend(Friend var1) { @@ -29,23 +30,23 @@ public class Friend extends Buddy { return -1; } else if (var1.world != 0 && super.world == 0) { return 1; - } else if (this.field3629 && !var1.field3629) { + } else if (this.field3617 && !var1.field3617) { return -1; - } else if (!this.field3629 && var1.field3629) { + } else if (!this.field3617 && var1.field3617) { return 1; - } else if (this.field3630 && !var1.field3630) { + } else if (this.field3618 && !var1.field3618) { return -1; - } else if (!this.field3630 && var1.field3630) { + } else if (!this.field3618 && var1.field3618) { return 1; } else { return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2; } } - @ObfuscatedName("v") + @ObfuscatedName("ay") @ObfuscatedSignature( - signature = "(Ljr;B)I", - garbageValue = "41" + signature = "(Ljy;S)I", + garbageValue = "9221" ) @Export("compareTo_user") public int compareTo_user(User var1) { @@ -58,52 +59,88 @@ public class Friend extends Buddy { @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-825705813" + signature = "(ILcu;ZI)I", + garbageValue = "316315133" ) - public static int method5293(int var0) { - if (var0 > 0) { - return 1; + static int method5286(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { + var0 -= 1000; + var3 = Tile.getWidget(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); } else { - return var0 < 0 ? -1 : 0; + var3 = var2 ? UserComparator7.field1946 : class197.field2398; + } + + LoginPacket.invalidateWidget(var3); + if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { + if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { + var3.modelType = 2; + var3.modelId = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { + var3.modelType = 3; + var3.modelId = Message.localPlayer.appearance.getChatHeadId(); + return 1; + } else { + return 2; + } + } else { + class188.Interpreter_intStackSize -= 2; + int var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + int var5 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + var3.itemId = var4; + var3.itemQuantity = var5; + ItemDefinition var6 = PacketBufferNode.ItemDefinition_get(var4); + var3.modelAngleX = var6.xan2d; + var3.modelAngleY = var6.yan2d; + var3.modelAngleZ = var6.zan2d; + var3.modelOffsetX = var6.offsetX2d; + var3.modelOffsetY = var6.offsetY2d; + var3.modelZoom = var6.zoom2d; + if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) { + var3.itemQuantityMode = 0; + } else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | 1 == var6.isStackable) { + var3.itemQuantityMode = 1; + } else { + var3.itemQuantityMode = 2; + } + + if (var3.field2645 > 0) { + var3.modelZoom = var3.modelZoom * 32 / var3.field2645; + } else if (var3.rawWidth > 0) { + var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; + } + + return 1; } } - @ObfuscatedName("jy") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(ZB)V", - garbageValue = "0" + signature = "(I)Lbe;", + garbageValue = "-422000887" ) - @Export("setTapToDrop") - static void setTapToDrop(boolean var0) { - Client.tapToDrop = var0; + @Export("getNextWorldListWorld") + static World getNextWorldListWorld() { + return World.World_listCount < World.World_count ? class162.World_worlds[++World.World_listCount - 1] : null; } - @ObfuscatedName("jf") + @ObfuscatedName("kq") @ObfuscatedSignature( - signature = "(IIII)Lbf;", - garbageValue = "-252811827" + signature = "(I)V", + garbageValue = "-2130982399" ) - static final InterfaceParent method5303(int var0, int var1, int var2) { - InterfaceParent var3 = new InterfaceParent(); - var3.group = var1; - var3.type = var2; - Client.interfaceParents.put(var3, (long)var0); - WorldMapArea.Widget_resetModelFrames(var1); - Widget var4 = Language.getWidget(var0); - ScriptEvent.invalidateWidget(var4); - if (Client.meslayerContinueWidget != null) { - ScriptEvent.invalidateWidget(Client.meslayerContinueWidget); - Client.meslayerContinueWidget = null; + @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(); } - Varps.method4043(); - MilliClock.revalidateWidgetScroll(FloorDecoration.Widget_interfaceComponents[var0 >> 16], var4, false); - UserComparator9.runWidgetOnLoadListener(var1); - if (Client.rootInterface != -1) { - GrandExchangeEvents.runIntfCloseListeners(Client.rootInterface, 1); + class216.method4013(); + if (Calendar.clanChat != null) { + Calendar.clanChat.clearFriends(); } - return var3; } } diff --git a/runescape-client/src/main/java/FriendLoginUpdate.java b/runescape-client/src/main/java/FriendLoginUpdate.java index d528ced360..0984c33ca7 100644 --- a/runescape-client/src/main/java/FriendLoginUpdate.java +++ b/runescape-client/src/main/java/FriendLoginUpdate.java @@ -4,68 +4,50 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jf") +@ObfuscatedName("jj") @Implements("FriendLoginUpdate") public class FriendLoginUpdate extends Link { - @ObfuscatedName("rc") - @ObfuscatedGetter( - intValue = -1971912431 - ) - static int field3643; - @ObfuscatedName("i") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Lhf;" + signature = "Lhz;" ) - @Export("Widget_modelsArchive") - public static AbstractArchive Widget_modelsArchive; - @ObfuscatedName("b") + @Export("Widget_archive") + static AbstractArchive Widget_archive; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 674667209 + intValue = 1496749481 ) - public int field3646; - @ObfuscatedName("g") + public int field3623; + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Ljb;" + signature = "Ljc;" ) @Export("username") public Username username; - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("world") public short world; @ObfuscatedSignature( - signature = "(Ljb;I)V" + signature = "(Ljc;I)V" ) FriendLoginUpdate(Username var1, int var2) { - this.field3646 = (int)(TaskHandler.currentTimeMillis() / 1000L); + this.field3623 = (int)(WorldMapID.currentTimeMillis() / 1000L); this.username = var1; this.world = (short)var2; } - @ObfuscatedName("c") + @ObfuscatedName("f") + static double method5301(double var0) { + return Math.exp(var0 * -var0 / 2.0D) / Math.sqrt(6.283185307179586D); + } + + @ObfuscatedName("au") @ObfuscatedSignature( - signature = "(IIII)I", - garbageValue = "1735579843" + signature = "(Lcz;I)V", + garbageValue = "-651295245" ) - @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; + public static final void method5300(class97 var0) { + ChatChannel.pcmPlayerProvider = var0; } } diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java index cb8f9be5d8..642fe0d8c7 100644 --- a/runescape-client/src/main/java/FriendSystem.java +++ b/runescape-client/src/main/java/FriendSystem.java @@ -1,91 +1,95 @@ +import java.util.concurrent.ScheduledExecutorService; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bz") +@ObfuscatedName("bi") @Implements("FriendSystem") public class FriendSystem { - @ObfuscatedName("g") + @ObfuscatedName("x") + @Export("soundSystemExecutor") + static ScheduledExecutorService soundSystemExecutor; + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Llg;" + signature = "Lll;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Ljh;" + signature = "Ljr;" ) @Export("friendsList") public final FriendsList friendsList; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( signature = "Lju;" ) @Export("ignoreList") public final IgnoreList ignoreList; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 618152065 + intValue = 1346758177 ) - int field1061; + int field1045; @ObfuscatedSignature( - signature = "(Llg;)V" + signature = "(Lll;)V" ) FriendSystem(LoginType var1) { - this.field1061 = 0; + this.field1045 = 0; this.loginType = var1; this.friendsList = new FriendsList(var1); this.ignoreList = new IgnoreList(var1); } - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-1963052463" - ) - boolean method1870() { - return this.field1061 == 2; - } - @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-31" + signature = "(I)Z", + garbageValue = "-1542848201" ) - final void method1867() { - this.field1061 = 1; + boolean method1844() { + return this.field1045 == 2; } - @ObfuscatedName("b") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkg;IB)V", - garbageValue = "52" + signature = "(B)V", + garbageValue = "0" + ) + final void method1845() { + this.field1045 = 1; + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "(Lkq;II)V", + garbageValue = "818210154" ) @Export("readUpdate") final void readUpdate(Buffer var1, int var2) { this.friendsList.read(var1, var2); - this.field1061 = 2; - WorldMapIcon_1.FriendSystem_invalidateFriends(); + this.field1045 = 2; + Friend.FriendSystem_invalidateFriends(); } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "2007033957" + signature = "(B)V", + garbageValue = "64" ) @Export("processFriendUpdates") final void processFriendUpdates() { for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { - if ((long)var1.field3646 < TaskHandler.currentTimeMillis() / 1000L - 5L) { + if ((long)var1.field3623 < WorldMapID.currentTimeMillis() / 1000L - 5L) { if (var1.world > 0) { - GrandExchangeOfferAgeComparator.addGameMessage(5, "", var1.username + " has logged in."); + class83.addGameMessage(5, "", var1.username + " has logged in."); } if (var1.world == 0) { - GrandExchangeOfferAgeComparator.addGameMessage(5, "", var1.username + " has logged out."); + class83.addGameMessage(5, "", var1.username + " has logged out."); } var1.remove(); @@ -94,38 +98,38 @@ public class FriendSystem { } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-242142328" + signature = "(B)V", + garbageValue = "-3" ) @Export("clear") final void clear() { - this.field1061 = 0; + this.field1045 = 0; this.friendsList.clear(); this.ignoreList.clear(); } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(Ljb;ZI)Z", - garbageValue = "-557958994" + signature = "(Ljc;ZI)Z", + garbageValue = "-1562604277" ) @Export("isFriended") final boolean isFriended(Username var1, boolean var2) { if (var1 == null) { return false; - } else if (var1.equals(class215.localPlayer.username)) { + } else if (var1.equals(Message.localPlayer.username)) { return true; } else { return this.friendsList.isFriended(var1, var2); } } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Ljb;B)Z", - garbageValue = "94" + signature = "(Ljc;I)Z", + garbageValue = "-408948257" ) @Export("isIgnored") final boolean isIgnored(Username var1) { @@ -136,10 +140,10 @@ public class FriendSystem { } } - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "905679920" + signature = "(Ljava/lang/String;B)V", + garbageValue = "-28" ) @Export("addFriend") final void addFriend(String var1) { @@ -147,16 +151,16 @@ public class FriendSystem { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { if (this.friendsListIsFull()) { - PacketBufferNode.method3670(); - } else if (class215.localPlayer.username.equals(var2)) { - WorldMapSection2.method347("You can't add yourself to your own friend list"); + WorldMapRegion.method446(); + } else if (Message.localPlayer.username.equals(var2)) { + Tiles.method1143("You can't add yourself to your own friend list"); } else if (this.isFriended(var2, false)) { - class65.method1244(var1); + class288.method5335(var1); } else if (this.isIgnored(var2)) { - WorldMapSection2.method347("Please remove " + var1 + " from your ignore list first"); + Tiles.method1143("Please remove " + var1 + " from your ignore list first"); } else { - PacketBufferNode var3 = ModelData0.getPacketBufferNode(ClientPacket.field2268, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(class173.stringCp1252NullTerminatedByteSize(var1)); + PacketBufferNode var3 = class2.getPacketBufferNode(ClientPacket.field2236, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(ViewportMouse.stringCp1252NullTerminatedByteSize(var1)); var3.packetBuffer.writeStringCp1252NullTerminated(var1); Client.packetWriter.addNode(var3); } @@ -164,20 +168,20 @@ public class FriendSystem { } } - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1079308803" + garbageValue = "1773395073" ) @Export("friendsListIsFull") final boolean friendsListIsFull() { - return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field789 != 1; + return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field746 != 1; } - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", - garbageValue = "15" + signature = "(Ljava/lang/String;I)V", + garbageValue = "1243376516" ) @Export("addIgnore") final void addIgnore(String var1) { @@ -185,34 +189,37 @@ public class FriendSystem { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { if (this.canAddIgnore()) { - GrandExchangeOfferNameComparator.method145(); - } else if (class215.localPlayer.username.equals(var2)) { - WorldMapSection2.method347("You can't add yourself to your own ignore list"); + VertexNormal.method2996(); + } else if (Message.localPlayer.username.equals(var2)) { + WorldMapCacheName.method620(); } else if (this.isIgnored(var2)) { - WorldMapSection2.method347(var1 + " is already on your ignore list"); + Tiles.method1143(var1 + " is already on your ignore list"); } else if (this.isFriended(var2, false)) { - WorldMapSectionType.method269(var1); + class191.method3640(var1); } else { - class218.method4179(var1); + PacketBufferNode var3 = class2.getPacketBufferNode(ClientPacket.field2206, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(ViewportMouse.stringCp1252NullTerminatedByteSize(var1)); + var3.packetBuffer.writeStringCp1252NullTerminated(var1); + Client.packetWriter.addNode(var3); } } } } - @ObfuscatedName("s") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "97" + signature = "(I)Z", + garbageValue = "-1684864200" ) @Export("canAddIgnore") final boolean canAddIgnore() { - return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field789 != 1; + return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field746 != 1; } - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "(Ljava/lang/String;I)V", - garbageValue = "-774164721" + garbageValue = "975666104" ) @Export("removeFriend") final void removeFriend(String var1) { @@ -220,22 +227,22 @@ public class FriendSystem { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { if (this.friendsList.removeByUsername(var2)) { - Client.field833 = Client.cycleCntr; - PacketBufferNode var3 = ModelData0.getPacketBufferNode(ClientPacket.field2289, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(class173.stringCp1252NullTerminatedByteSize(var1)); + VertexNormal.method2995(); + PacketBufferNode var3 = class2.getPacketBufferNode(ClientPacket.field2238, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(ViewportMouse.stringCp1252NullTerminatedByteSize(var1)); var3.packetBuffer.writeStringCp1252NullTerminated(var1); Client.packetWriter.addNode(var3); } - WorldMapIcon_1.FriendSystem_invalidateFriends(); + Friend.FriendSystem_invalidateFriends(); } } } - @ObfuscatedName("m") + @ObfuscatedName("h") @ObfuscatedSignature( signature = "(Ljava/lang/String;I)V", - garbageValue = "-1018111" + garbageValue = "2048585665" ) @Export("removeIgnore") final void removeIgnore(String var1) { @@ -243,22 +250,22 @@ public class FriendSystem { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { if (this.ignoreList.removeByUsername(var2)) { - Client.field833 = Client.cycleCntr; - PacketBufferNode var3 = ModelData0.getPacketBufferNode(ClientPacket.field2217, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(class173.stringCp1252NullTerminatedByteSize(var1)); + VertexNormal.method2995(); + PacketBufferNode var3 = class2.getPacketBufferNode(ClientPacket.field2260, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(ViewportMouse.stringCp1252NullTerminatedByteSize(var1)); var3.packetBuffer.writeStringCp1252NullTerminated(var1); Client.packetWriter.addNode(var3); } - Language.FriendSystem_invalidateIgnoreds(); + GameShell.FriendSystem_invalidateIgnoreds(); } } } - @ObfuscatedName("q") + @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "(Ljb;B)Z", - garbageValue = "0" + signature = "(Ljc;I)Z", + garbageValue = "-2137551829" ) @Export("isFriendAndHasWorld") final boolean isFriendAndHasWorld(Username var1) { @@ -266,21 +273,63 @@ public class FriendSystem { return var2 != null && var2.hasWorld(); } - @ObfuscatedName("u") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(I)[Lgd;", - garbageValue = "-1110076754" + signature = "(I)V", + garbageValue = "-435303731" ) - public static class185[] method1927() { - return new class185[]{class185.field2334, class185.field2332, class185.field2333, class185.field2339, class185.field2336, class185.field2341, class185.field2337, class185.field2331, class185.field2335, class185.field2340}; + @Export("savePreferences") + static void savePreferences() { + AccessFile var0 = null; + + try { + var0 = Messages.getPreferencesFile("", AbstractWorldMapIcon.field284.name, true); + Buffer var1 = Interpreter.clientPreferences.toBuffer(); + var0.write(var1.array, 0, var1.offset); + } catch (Exception var3) { + } + + try { + if (var0 != null) { + var0.closeSync(true); + } + } catch (Exception var2) { + } + } - @ObfuscatedName("ge") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "-90" + signature = "(II)V", + garbageValue = "2090172291" ) - static boolean method1920() { - return (Client.drawPlayerNames & 2) != 0; + @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("km") + @ObfuscatedSignature( + signature = "(Lha;IIII)V", + garbageValue = "688328393" + ) + @Export("drawCompass") + static final void drawCompass(Widget var0, int var1, int var2, int var3) { + SpriteMask var4 = var0.getSpriteMask(false); + if (var4 != null) { + if (Client.minimapState < 3) { + GrandExchangeOfferTotalQuantityComparator.compass.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths); + } else { + Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); + } + + } } } diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java index ead290bce8..a4d727c4b2 100644 --- a/runescape-client/src/main/java/FriendsList.java +++ b/runescape-client/src/main/java/FriendsList.java @@ -1,67 +1,65 @@ -import java.awt.Image; +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("jh") +@ObfuscatedName("jr") @Implements("FriendsList") public class FriendsList extends UserList { - @ObfuscatedName("aa") - static Image field3623; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Llg;" + signature = "Lll;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -273540175 + intValue = 1316127355 ) - int field3621; - @ObfuscatedName("k") + int field3603; + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Ljj;" + signature = "Ljw;" ) @Export("friendLoginUpdates") public LinkDeque friendLoginUpdates; @ObfuscatedSignature( - signature = "(Llg;)V" + signature = "(Lll;)V" ) public FriendsList(LoginType var1) { super(400); - this.field3621 = 1; + this.field3603 = 1; this.friendLoginUpdates = new LinkDeque(); this.loginType = var1; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(I)Ljr;", - garbageValue = "-1592540968" + signature = "(B)Ljy;", + garbageValue = "68" ) @Export("newInstance") User newInstance() { return new Friend(); } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IB)[Ljr;", - garbageValue = "-122" + signature = "(IB)[Ljy;", + garbageValue = "32" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new Friend[var1]; } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Ljb;ZI)Z", - garbageValue = "-331352727" + signature = "(Ljc;ZI)Z", + garbageValue = "-1998488053" ) @Export("isFriended") public boolean isFriended(Username var1, boolean var2) { @@ -73,10 +71,10 @@ public class FriendsList extends UserList { } } - @ObfuscatedName("o") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lkg;IB)V", - garbageValue = "78" + signature = "(Lkq;IB)V", + garbageValue = "-60" ) @Export("read") public void read(Buffer var1, int var2) { @@ -101,7 +99,7 @@ public class FriendsList extends UserList { Friend var11 = (Friend)this.getByCurrentUsername(var4); if (var3) { Friend var12 = (Friend)this.getByCurrentUsername(var5); - if (var12 != null && var12 != var11) { + if (var12 != null && var11 != var12) { if (var11 != null) { this.remove(var12); } else { @@ -140,17 +138,17 @@ public class FriendsList extends UserList { } if (var6 != var11.world) { - var11.int2 = ++this.field3621 - 1; + var11.int2 = ++this.field3603 - 1; if (var11.world == -1 && var6 == 0) { - var11.int2 = -(var11.int2 * -460007471) * 1502929201; + var11.int2 = -(var11.int2 * 604472963) * 509966379; } var11.world = var6; } var11.rank = var7; - var11.field3629 = var9; - var11.field3630 = var10; + var11.field3617 = var9; + var11.field3618 = var10; continue; } @@ -161,4 +159,68 @@ public class FriendsList extends UserList { return; } } + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(Lky;ZI)V", + garbageValue = "491459043" + ) + public static void method5229(AbstractSocket var0, boolean var1) { + if (class297.NetCache_socket != null) { + try { + class297.NetCache_socket.close(); + } catch (Exception var6) { + } + + class297.NetCache_socket = null; + } + + class297.NetCache_socket = var0; + BuddyRankComparator.method3362(var1); + NetCache.NetCache_responseHeaderBuffer.offset = 0; + PrivateChatMode.NetCache_currentResponse = null; + NetCache.NetCache_responseArchiveBuffer = null; + NetCache.field3150 = 0; + + while (true) { + NetFileRequest var2 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); + if (var2 == null) { + while (true) { + var2 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); + if (var2 == null) { + if (NetCache.field3145 != 0) { + try { + Buffer var7 = new Buffer(4); + var7.writeByte(4); + var7.writeByte(NetCache.field3145); + var7.writeShort(0); + class297.NetCache_socket.write(var7.array, 0, 4); + } catch (IOException var5) { + try { + class297.NetCache_socket.close(); + } catch (Exception var4) { + } + + ++NetCache.NetCache_ioExceptions; + class297.NetCache_socket = null; + } + } + + NetCache.NetCache_loadTime = 0; + NetCache.field3138 = WorldMapID.currentTimeMillis(); + return; + } + + NetCache.NetCache_pendingWritesQueue.addLast(var2); + NetCache.NetCache_pendingWrites.put(var2, var2.key); + ++NetCache.NetCache_pendingWritesCount; + --NetCache.NetCache_pendingResponsesCount; + } + } + + NetCache.NetCache_pendingPriorityWrites.put(var2, var2.key); + ++NetCache.NetCache_pendingPriorityWritesCount; + --NetCache.NetCache_pendingPriorityResponsesCount; + } + } } diff --git a/runescape-client/src/main/java/GZipDecompressor.java b/runescape-client/src/main/java/GZipDecompressor.java index fcbae70418..b2d17d9bb7 100644 --- a/runescape-client/src/main/java/GZipDecompressor.java +++ b/runescape-client/src/main/java/GZipDecompressor.java @@ -4,13 +4,23 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lk") +@ObfuscatedName("lw") @Implements("GZipDecompressor") public class GZipDecompressor { - @ObfuscatedName("u") + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "Lgm;" + ) + @Export("midiPcmStream") + public static MidiPcmStream midiPcmStream; + @ObfuscatedName("f") @Export("inflater") Inflater inflater; + public GZipDecompressor() { + this(-1, 1000000, 1000000); + } + @ObfuscatedSignature( signature = "(III)V", garbageValue = "1000000" @@ -18,14 +28,10 @@ public class GZipDecompressor { GZipDecompressor(int var1, int var2, int var3) { } - public GZipDecompressor() { - this(-1, 1000000, 1000000); - } - - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Lkg;[BI)V", - garbageValue = "1447004496" + signature = "(Lkq;[BI)V", + garbageValue = "367442477" ) @Export("decompress") public void decompress(Buffer var1, byte[] var2) { diff --git a/runescape-client/src/main/java/GameObject.java b/runescape-client/src/main/java/GameObject.java index d1f403ee4b..1e595a0a38 100644 --- a/runescape-client/src/main/java/GameObject.java +++ b/runescape-client/src/main/java/GameObject.java @@ -4,100 +4,89 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eh") +@ObfuscatedName("el") @Implements("GameObject") public final class GameObject { - @ObfuscatedName("qf") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1623440827 - ) - static int field1933; - @ObfuscatedName("hl") - @ObfuscatedGetter( - intValue = 143211467 - ) - @Export("cameraY") - static int cameraY; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 602271545 + intValue = -1053912573 ) @Export("plane") int plane; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 996548305 + intValue = 684195751 ) @Export("height") int height; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -28565159 + intValue = -2140499041 ) @Export("centerX") int centerX; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -213801155 + intValue = 1955373001 ) @Export("centerY") int centerY; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lee;" + signature = "Lep;" ) @Export("entity") public Entity entity; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1884988183 + intValue = -472959783 ) @Export("orientation") int orientation; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -422485367 + intValue = 1045037505 ) @Export("startX") int startX; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 640777493 + intValue = 820155369 ) @Export("endX") int endX; - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1986114597 + intValue = -1317685703 ) @Export("startY") int startY; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1415770979 + intValue = -1799608733 ) @Export("endY") int endY; - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -2079543087 + intValue = 262139045 ) - int field1925; - @ObfuscatedName("x") + int field1909; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1243689435 + intValue = -792485469 ) @Export("lastDrawn") int lastDrawn; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedGetter( - longValue = 9016646142835721523L + longValue = -9063285699696577959L ) @Export("tag") public long tag; - @ObfuscatedName("e") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -2013432545 + intValue = 1504732917 ) @Export("flags") int flags; @@ -107,110 +96,35 @@ public final class GameObject { this.flags = 0; } - @ObfuscatedName("b") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(IILfg;Lfh;I)Z", - garbageValue = "-1345578739" + signature = "(Lgo;S)V", + garbageValue = "-26939" ) - static final boolean method3342(int var0, int var1, RouteStrategy var2, CollisionMap var3) { - int var4 = var0; - int var5 = var1; - byte var6 = 64; - byte var7 = 64; - int var8 = var0 - var6; - int var9 = var1 - var7; - class173.directions[var6][var7] = 99; - class173.distances[var6][var7] = 0; - byte var10 = 0; - int var11 = 0; - class173.bufferX[var10] = var0; - byte var10001 = var10; - int var18 = var10 + 1; - class173.bufferY[var10001] = var1; - int[][] var12 = var3.flags; + public static void method3296(Huffman var0) { + class206.huffman = var0; + } - while (var18 != var11) { - var4 = class173.bufferX[var11]; - var5 = class173.bufferY[var11]; - var11 = var11 + 1 & 4095; - int var16 = var4 - var8; - int var17 = var5 - var9; - int var13 = var4 - var3.xInset; - int var14 = var5 - var3.yInset; - if (var2.hasArrived(2, var4, var5, var3)) { - class173.field2103 = var4; - class173.field2100 = var5; - return true; - } + @ObfuscatedName("hd") + @ObfuscatedSignature( + signature = "(I)Z", + garbageValue = "1099485994" + ) + static boolean method3298() { + return (Client.drawPlayerNames & 1) != 0; + } - 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; + @ObfuscatedName("if") + @ObfuscatedSignature( + signature = "(IIIIB)V", + garbageValue = "3" + ) + static final void method3297(int var0, int var1, int var2, int var3) { + for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { + if (Client.rootWidgetWidths[var4] + Client.rootWidgetXs[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetHeights[var4] + Client.rootWidgetYs[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { + Client.field833[var4] = true; } } - class173.field2103 = var4; - class173.field2100 = var5; - return false; } } diff --git a/runescape-client/src/main/java/GameShell.java b/runescape-client/src/main/java/GameShell.java index 6ab504b2e9..d9bcc00df2 100644 --- a/runescape-client/src/main/java/GameShell.java +++ b/runescape-client/src/main/java/GameShell.java @@ -18,6 +18,8 @@ import java.awt.event.WindowEvent; import java.awt.event.WindowListener; import java.awt.image.ImageObserver; import java.net.URL; +import java.security.SecureRandom; +import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; @@ -25,167 +27,176 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bo") +@ObfuscatedName("bj") @Implements("GameShell") public abstract class GameShell extends Applet implements Runnable, FocusListener, WindowListener { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lfu;" + signature = "Lfl;" ) @Export("taskHandler") protected static TaskHandler taskHandler; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lbo;" + signature = "Lbj;" ) @Export("gameShell") static GameShell gameShell; - @ObfuscatedName("b") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1923689957 + intValue = -641610179 ) @Export("GameShell_redundantStartThreadCount") static int GameShell_redundantStartThreadCount; - @ObfuscatedName("g") + @ObfuscatedName("b") @ObfuscatedGetter( - longValue = -711950158356493609L + longValue = 9100784568139966685L ) @Export("stopTimeMs") static long stopTimeMs; - @ObfuscatedName("z") + @ObfuscatedName("e") @Export("isKilled") static boolean isKilled; - @ObfuscatedName("h") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 844501225 + intValue = 1686581025 ) @Export("gameCyclesToDo") - protected static int gameCyclesToDo; - @ObfuscatedName("i") + static int gameCyclesToDo; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1954278037 + intValue = 777361689 ) @Export("cycleDurationMillis") static int cycleDurationMillis; - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 814037945 + intValue = -224666491 ) @Export("fiveOrOne") static int fiveOrOne; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 526235567 + intValue = 1353428271 ) @Export("fps") protected static int fps; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("graphicsTickTimes") - protected static long[] graphicsTickTimes; - @ObfuscatedName("a") + static long[] graphicsTickTimes; + @ObfuscatedName("j") @Export("clientTickTimes") - protected static long[] clientTickTimes; - @ObfuscatedName("ai") - @Export("fontHelvetica13") - static java.awt.Font fontHelvetica13; - @ObfuscatedName("ab") + static long[] clientTickTimes; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -150498005 + intValue = 1909325521 ) - static int field459; - @ObfuscatedName("ap") + @Export("clientTickTimeIdx") + static int clientTickTimeIdx; + @ObfuscatedName("an") + @ObfuscatedGetter( + intValue = 2131484097 + ) + static int field442; + @ObfuscatedName("ag") + @Export("null_string") + protected static String null_string; + @ObfuscatedName("aj") @Export("volatileFocus") static volatile boolean volatileFocus; - @ObfuscatedName("ay") + @ObfuscatedName("ax") + @Export("hasFocus") + protected static boolean hasFocus; + @ObfuscatedName("af") @ObfuscatedGetter( - longValue = 7372771313492696971L + longValue = -7455668371205512405L ) @Export("garbageCollectorLastCollectionTime") static long garbageCollectorLastCollectionTime; - @ObfuscatedName("ax") + @ObfuscatedName("ap") @ObfuscatedGetter( - longValue = 6756916101787281109L + longValue = 4016569584123468349L ) @Export("garbageCollectorLastCheckTimeMs") static long garbageCollectorLastCheckTimeMs; - @ObfuscatedName("p") + @ObfuscatedName("a") @Export("hasErrored") boolean hasErrored; - @ObfuscatedName("s") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -547568387 + intValue = -1294552549 ) @Export("contentWidth") protected int contentWidth; - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 683939377 + intValue = 1325726667 ) @Export("contentHeight") protected int contentHeight; - @ObfuscatedName("m") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 719542385 + intValue = 301736505 ) @Export("canvasX") int canvasX; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1012759109 + intValue = -380682277 ) @Export("canvasY") int canvasY; - @ObfuscatedName("j") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1249070367 + intValue = 177005865 ) - int field442; - @ObfuscatedName("af") + int field422; + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = 1228347859 + intValue = -973414545 ) - int field455; - @ObfuscatedName("ad") + int field419; + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 895763941 + intValue = -1421773905 ) @Export("maxCanvasWidth") int maxCanvasWidth; - @ObfuscatedName("am") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = 1882164127 + intValue = -1295726035 ) @Export("maxCanvasHeight") int maxCanvasHeight; - @ObfuscatedName("ao") + @ObfuscatedName("au") @Export("frame") Frame frame; - @ObfuscatedName("aw") + @ObfuscatedName("ah") @Export("canvas") java.awt.Canvas canvas; - @ObfuscatedName("ak") - volatile boolean field451; + @ObfuscatedName("aq") + volatile boolean field441; @ObfuscatedName("ar") @Export("resizeCanvasNextFrame") boolean resizeCanvasNextFrame; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("isCanvasInvalid") volatile boolean isCanvasInvalid; - @ObfuscatedName("aq") + @ObfuscatedName("ay") @ObfuscatedGetter( - longValue = -6875842226424781075L + longValue = -550233093924080547L ) - volatile long field463; - @ObfuscatedName("at") + volatile long field418; + @ObfuscatedName("al") @ObfuscatedSignature( - signature = "Lap;" + signature = "Lad;" ) @Export("mouseWheelHandler") MouseWheelHandler mouseWheelHandler; @ObfuscatedName("ae") @Export("clipboard") Clipboard clipboard; - @ObfuscatedName("aj") + @ObfuscatedName("ad") @Export("eventQueue") final EventQueue eventQueue; @@ -199,7 +210,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene fps = 0; graphicsTickTimes = new long[32]; clientTickTimes = new long[32]; - field459 = 500; + field442 = 500; volatileFocus = true; garbageCollectorLastCollectionTime = -1L; garbageCollectorLastCheckTimeMs = -1L; @@ -209,10 +220,10 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.hasErrored = false; this.canvasX = 0; this.canvasY = 0; - this.field451 = true; + this.field441 = true; this.resizeCanvasNextFrame = false; this.isCanvasInvalid = false; - this.field463 = 0L; + this.field418 = 0L; EventQueue var1 = null; try { @@ -221,37 +232,34 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } this.eventQueue = var1; - WorldMapLabel.method433(new DevicePcmPlayerProvider()); + FriendLoginUpdate.method5300(new DevicePcmPlayerProvider()); } - @ObfuscatedName("p") + @ObfuscatedName("a") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "744575449" + garbageValue = "-472959783" ) @Export("setMaxCanvasSize") protected final void setMaxCanvasSize(int var1, int var2) { if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { - this.method947(); + this.method936(); } this.maxCanvasWidth = var1; this.maxCanvasHeight = var2; } - @ObfuscatedName("h") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Ljava/lang/Object;I)V", - garbageValue = "-391960941" + signature = "(Ljava/lang/Object;B)V", + garbageValue = "-24" ) @Export("post") final void post(Object var1) { if (this.eventQueue != null) { for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { - try { - Thread.sleep(1L); - } catch (InterruptedException var4) { - } + ServerBuild.method4111(1L); } if (var1 != null) { @@ -261,10 +269,10 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } } - @ObfuscatedName("y") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)Lfk;", - garbageValue = "-1514990609" + signature = "(I)Lfs;", + garbageValue = "-1343369981" ) @Export("mouseWheel") protected MouseWheel mouseWheel() { @@ -276,59 +284,62 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene return this.mouseWheelHandler; } - @ObfuscatedName("w") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1232345027" + garbageValue = "-2116975887" ) @Export("setUpClipboard") protected void setUpClipboard() { this.clipboard = this.getToolkit().getSystemClipboard(); } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "724915000" + signature = "(Ljava/lang/String;S)V", + garbageValue = "-9007" ) @Export("clipboardSetString") protected void clipboardSetString(String var1) { this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); } - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "2141966350" + signature = "(B)V", + garbageValue = "-54" ) @Export("setUpKeyboard") protected final void setUpKeyboard() { - GrandExchangeOfferNameComparator.method153(); - class14.method178(this.canvas); + WorldMapData_1.method722(); + GrandExchangeOfferTotalQuantityComparator.method93(this.canvas); } - @ObfuscatedName("x") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "-47" + garbageValue = "-57" ) @Export("setUpMouse") protected final void setUpMouse() { - VarcInt.method4484(this.canvas); + java.awt.Canvas var1 = this.canvas; + var1.addMouseListener(MouseHandler.MouseHandler_instance); + var1.addMouseMotionListener(MouseHandler.MouseHandler_instance); + var1.addFocusListener(MouseHandler.MouseHandler_instance); } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1570451977" + signature = "(B)V", + garbageValue = "-92" ) @Export("resizeCanvas") final void resizeCanvas() { Container var1 = this.container(); if (var1 != null) { Bounds var2 = this.getFrameContentBounds(); - this.contentWidth = Math.max(var2.highX, this.field442); - this.contentHeight = Math.max(var2.highY, this.field455); + this.contentWidth = Math.max(var2.highX, this.field422); + this.contentHeight = Math.max(var2.highY, this.field419); if (this.contentWidth <= 0) { this.contentWidth = 1; } @@ -337,33 +348,33 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.contentHeight = 1; } - BoundaryObject.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); - WorldMapCacheName.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); - this.canvasX = (this.contentWidth - BoundaryObject.canvasWidth) / 2; + GrandExchangeOfferTotalQuantityComparator.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); + AttackOption.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); + this.canvasX = (this.contentWidth - GrandExchangeOfferTotalQuantityComparator.canvasWidth) / 2; this.canvasY = 0; - this.canvas.setSize(BoundaryObject.canvasWidth, WorldMapCacheName.canvasHeight); - DirectByteArrayCopier.rasterProvider = new RasterProvider(BoundaryObject.canvasWidth, WorldMapCacheName.canvasHeight, this.canvas); + this.canvas.setSize(GrandExchangeOfferTotalQuantityComparator.canvasWidth, AttackOption.canvasHeight); + IgnoreList.rasterProvider = new RasterProvider(GrandExchangeOfferTotalQuantityComparator.canvasWidth, AttackOption.canvasHeight, this.canvas); if (var1 == this.frame) { Insets var3 = this.frame.getInsets(); - this.canvas.setLocation(this.canvasX + var3.left, this.canvasY + var3.top); + this.canvas.setLocation(this.canvasX + var3.left, var3.top + this.canvasY); } else { this.canvas.setLocation(this.canvasX, this.canvasY); } - this.field451 = true; + this.field441 = true; this.resizeGame(); } } - @ObfuscatedName("e") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1452127908" + garbageValue = "-1309389764" ) @Export("resizeGame") protected abstract void resizeGame(); - @ObfuscatedName("n") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "(B)V", garbageValue = "14" @@ -372,8 +383,8 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene void clearBackground() { int var1 = this.canvasX; int var2 = this.canvasY; - int var3 = this.contentWidth - BoundaryObject.canvasWidth - var1; - int var4 = this.contentHeight - WorldMapCacheName.canvasHeight - var2; + int var3 = this.contentWidth - GrandExchangeOfferTotalQuantityComparator.canvasWidth - var1; + int var4 = this.contentHeight - AttackOption.canvasHeight - var2; if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { try { Container var5 = this.container(); @@ -408,14 +419,14 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1864925789" + garbageValue = "-1861012974" ) @Export("replaceCanvas") final void replaceCanvas() { - GrandExchangeOffer.method129(this.canvas); + ArchiveDiskAction.method4120(this.canvas); java.awt.Canvas var1 = this.canvas; var1.removeMouseListener(MouseHandler.MouseHandler_instance); var1.removeMouseMotionListener(MouseHandler.MouseHandler_instance); @@ -426,19 +437,22 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } this.addCanvas(); - class14.method178(this.canvas); - VarcInt.method4484(this.canvas); + GrandExchangeOfferTotalQuantityComparator.method93(this.canvas); + java.awt.Canvas var2 = this.canvas; + var2.addMouseListener(MouseHandler.MouseHandler_instance); + var2.addMouseMotionListener(MouseHandler.MouseHandler_instance); + var2.addFocusListener(MouseHandler.MouseHandler_instance); if (this.mouseWheelHandler != null) { this.mouseWheelHandler.addTo(this.canvas); } - this.method947(); + this.method936(); } - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IIIB)V", - garbageValue = "-97" + signature = "(IIII)V", + garbageValue = "1709387242" ) @Export("startThread") protected final void startThread(int var1, int var2, int var3) { @@ -455,8 +469,8 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } gameShell = this; - BoundaryObject.canvasWidth = var1; - WorldMapCacheName.canvasHeight = var2; + GrandExchangeOfferTotalQuantityComparator.canvasWidth = var1; + AttackOption.canvasHeight = var2; RunException.RunException_revision = var3; RunException.RunException_applet = this; if (taskHandler == null) { @@ -465,16 +479,16 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene taskHandler.newThreadTask(this, 1); } catch (Exception var5) { - Calendar.RunException_sendStackTrace((String)null, var5); + DesktopPlatformInfoProvider.RunException_sendStackTrace((String)null, var5); this.error("crash"); } } - @ObfuscatedName("t") + @ObfuscatedName("aa") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1777926819" + garbageValue = "-1793942402" ) @Export("addCanvas") final synchronized void addCanvas() { @@ -484,20 +498,20 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene var1.remove(this.canvas); } - BoundaryObject.canvasWidth = Math.max(var1.getWidth(), this.field442); - WorldMapCacheName.canvasHeight = Math.max(var1.getHeight(), this.field455); + GrandExchangeOfferTotalQuantityComparator.canvasWidth = Math.max(var1.getWidth(), this.field422); + AttackOption.canvasHeight = Math.max(var1.getHeight(), this.field419); Insets var2; if (this.frame != null) { var2 = this.frame.getInsets(); - BoundaryObject.canvasWidth -= var2.right + var2.left; - WorldMapCacheName.canvasHeight -= var2.top + var2.bottom; + GrandExchangeOfferTotalQuantityComparator.canvasWidth -= var2.left + var2.right; + AttackOption.canvasHeight -= var2.top + var2.bottom; } this.canvas = new Canvas(this); var1.setBackground(Color.BLACK); var1.setLayout((LayoutManager)null); var1.add(this.canvas); - this.canvas.setSize(BoundaryObject.canvasWidth, WorldMapCacheName.canvasHeight); + this.canvas.setSize(GrandExchangeOfferTotalQuantityComparator.canvasWidth, AttackOption.canvasHeight); this.canvas.setVisible(true); this.canvas.setBackground(Color.BLACK); if (var1 == this.frame) { @@ -509,22 +523,22 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.canvas.addFocusListener(this); this.canvas.requestFocus(); - this.field451 = true; - if (DirectByteArrayCopier.rasterProvider != null && BoundaryObject.canvasWidth == DirectByteArrayCopier.rasterProvider.width && WorldMapCacheName.canvasHeight == DirectByteArrayCopier.rasterProvider.height) { - ((RasterProvider)DirectByteArrayCopier.rasterProvider).setComponent(this.canvas); - DirectByteArrayCopier.rasterProvider.drawFull(0, 0); + this.field441 = true; + if (IgnoreList.rasterProvider != null && GrandExchangeOfferTotalQuantityComparator.canvasWidth == IgnoreList.rasterProvider.width && AttackOption.canvasHeight == IgnoreList.rasterProvider.height) { + ((RasterProvider)IgnoreList.rasterProvider).setComponent(this.canvas); + IgnoreList.rasterProvider.drawFull(0, 0); } else { - DirectByteArrayCopier.rasterProvider = new RasterProvider(BoundaryObject.canvasWidth, WorldMapCacheName.canvasHeight, this.canvas); + IgnoreList.rasterProvider = new RasterProvider(GrandExchangeOfferTotalQuantityComparator.canvasWidth, AttackOption.canvasHeight, this.canvas); } this.isCanvasInvalid = false; - this.field463 = TaskHandler.currentTimeMillis(); + this.field418 = WorldMapID.currentTimeMillis(); } - @ObfuscatedName("m") + @ObfuscatedName("av") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "1146937119" + garbageValue = "-1830524310" ) @Export("checkHost") protected final boolean checkHost() { @@ -553,48 +567,48 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } } - @ObfuscatedName("v") + @ObfuscatedName("aw") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "22" + garbageValue = "-25" ) @Export("clientTick") void clientTick() { - long var1 = TaskHandler.currentTimeMillis(); - long var3 = clientTickTimes[WorldMapSection2.clientTickTimeIdx]; - clientTickTimes[WorldMapSection2.clientTickTimeIdx] = var1; - WorldMapSection2.clientTickTimeIdx = WorldMapSection2.clientTickTimeIdx + 1 & 31; + long var1 = WorldMapID.currentTimeMillis(); + long var3 = clientTickTimes[clientTickTimeIdx]; + clientTickTimes[clientTickTimeIdx] = var1; + clientTickTimeIdx = clientTickTimeIdx + 1 & 31; if (var3 != 0L && var1 > var3) { } synchronized(this) { - TextureProvider.hasFocus = volatileFocus; + hasFocus = volatileFocus; } this.doCycle(); } - @ObfuscatedName("q") + @ObfuscatedName("as") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1595065586" + garbageValue = "-2091999250" ) @Export("graphicsTick") void graphicsTick() { Container var1 = this.container(); - long var2 = TaskHandler.currentTimeMillis(); - long var4 = graphicsTickTimes[Coord.graphicsTickTimeIdx]; - graphicsTickTimes[Coord.graphicsTickTimeIdx] = var2; - Coord.graphicsTickTimeIdx = Coord.graphicsTickTimeIdx + 1 & 31; + long var2 = WorldMapID.currentTimeMillis(); + long var4 = graphicsTickTimes[class30.graphicsTickTimeIdx]; + graphicsTickTimes[class30.graphicsTickTimeIdx] = var2; + class30.graphicsTickTimeIdx = class30.graphicsTickTimeIdx + 1 & 31; if (0L != var4 && var2 > var4) { int var6 = (int)(var2 - var4); fps = ((var6 >> 1) + 32000) / var6; } - if (++field459 - 1 > 50) { - field459 -= 50; - this.field451 = true; - this.canvas.setSize(BoundaryObject.canvasWidth, WorldMapCacheName.canvasHeight); + if (++field442 - 1 > 50) { + field442 -= 50; + this.field441 = true; + this.canvas.setSize(GrandExchangeOfferTotalQuantityComparator.canvasWidth, AttackOption.canvasHeight); this.canvas.setVisible(true); if (var1 == this.frame) { Insets var7 = this.frame.getInsets(); @@ -608,42 +622,42 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.replaceCanvas(); } - this.method946(); - this.draw(this.field451); - if (this.field451) { + this.method998(); + this.draw(this.field441); + if (this.field441) { this.clearBackground(); } - this.field451 = false; + this.field441 = false; } - @ObfuscatedName("l") + @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1393805519" + signature = "(B)V", + garbageValue = "-1" ) - final void method946() { + final void method998() { Bounds var1 = this.getFrameContentBounds(); - if (var1.highX != this.contentWidth || this.contentHeight != var1.highY || this.resizeCanvasNextFrame) { + if (var1.highX != this.contentWidth || var1.highY != this.contentHeight || this.resizeCanvasNextFrame) { this.resizeCanvas(); this.resizeCanvasNextFrame = false; } } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1945680127" + signature = "(B)V", + garbageValue = "24" ) - final void method947() { + final void method936() { this.resizeCanvasNextFrame = true; } - @ObfuscatedName("ak") + @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "887145603" + signature = "(B)V", + garbageValue = "12" ) @Export("kill") final synchronized void kill() { @@ -674,91 +688,91 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } } - this.vmethod1301(); + this.vmethod1290(); } } - @ObfuscatedName("aa") + @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "81" + signature = "(I)V", + garbageValue = "557803519" ) @Export("setUp") protected abstract void setUp(); - @ObfuscatedName("ab") + @ObfuscatedName("ae") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "776219916" + garbageValue = "1971545072" ) @Export("doCycle") protected abstract void doCycle(); - @ObfuscatedName("ar") + @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "(ZB)V", - garbageValue = "-24" + signature = "(ZI)V", + garbageValue = "-1655647135" ) @Export("draw") protected abstract void draw(boolean var1); - @ObfuscatedName("av") + @ObfuscatedName("aj") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-105" + signature = "(I)V", + garbageValue = "1818676977" ) @Export("kill0") protected abstract void kill0(); - @ObfuscatedName("aq") + @ObfuscatedName("ax") @ObfuscatedSignature( signature = "(ILjava/lang/String;ZB)V", - garbageValue = "0" + garbageValue = "58" ) @Export("drawInitial") protected final void drawInitial(int var1, String var2, boolean var3) { try { Graphics var4 = this.canvas.getGraphics(); - if (fontHelvetica13 == null) { - fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); - class51.loginScreenFontMetrics = this.canvas.getFontMetrics(fontHelvetica13); + if (NetSocket.fontHelvetica13 == null) { + NetSocket.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); + WorldMapSprite.loginScreenFontMetrics = this.canvas.getFontMetrics(NetSocket.fontHelvetica13); } if (var3) { var4.setColor(Color.black); - var4.fillRect(0, 0, BoundaryObject.canvasWidth, WorldMapCacheName.canvasHeight); + var4.fillRect(0, 0, GrandExchangeOfferTotalQuantityComparator.canvasWidth, AttackOption.canvasHeight); } Color var5 = new Color(140, 17, 17); try { - if (FriendsList.field3623 == null) { - FriendsList.field3623 = this.canvas.createImage(304, 34); + if (class189.field2333 == null) { + class189.field2333 = this.canvas.createImage(304, 34); } - Graphics var6 = FriendsList.field3623.getGraphics(); + Graphics var6 = class189.field2333.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(fontHelvetica13); + var6.setFont(NetSocket.fontHelvetica13); var6.setColor(Color.white); - var6.drawString(var2, (304 - class51.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); - var4.drawImage(FriendsList.field3623, BoundaryObject.canvasWidth / 2 - 152, WorldMapCacheName.canvasHeight / 2 - 18, (ImageObserver)null); + var6.drawString(var2, (304 - WorldMapSprite.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); + var4.drawImage(class189.field2333, GrandExchangeOfferTotalQuantityComparator.canvasWidth / 2 - 152, AttackOption.canvasHeight / 2 - 18, (ImageObserver)null); } catch (Exception var9) { - int var7 = BoundaryObject.canvasWidth / 2 - 152; - int var8 = WorldMapCacheName.canvasHeight / 2 - 18; + int var7 = GrandExchangeOfferTotalQuantityComparator.canvasWidth / 2 - 152; + int var8 = AttackOption.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(fontHelvetica13); + var4.setFont(NetSocket.fontHelvetica13); var4.setColor(Color.white); - var4.drawString(var2, var7 + (304 - class51.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); + var4.drawString(var2, var7 + (304 - WorldMapSprite.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); } } catch (Exception var10) { this.canvas.repaint(); @@ -766,21 +780,21 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } - @ObfuscatedName("ac") + @ObfuscatedName("at") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1200081624" + signature = "(B)V", + garbageValue = "21" ) - protected final void method991() { - FriendsList.field3623 = null; - fontHelvetica13 = null; - class51.loginScreenFontMetrics = null; + protected final void method947() { + class189.field2333 = null; + NetSocket.fontHelvetica13 = null; + WorldMapSprite.loginScreenFontMetrics = null; } - @ObfuscatedName("az") + @ObfuscatedName("af") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", - garbageValue = "18" + signature = "(Ljava/lang/String;I)V", + garbageValue = "-2001390999" ) @Export("error") protected void error(String var1) { @@ -796,26 +810,26 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } } - @ObfuscatedName("at") + @ObfuscatedName("ap") @ObfuscatedSignature( - signature = "(S)Ljava/awt/Container;", - garbageValue = "1024" + signature = "(I)Ljava/awt/Container;", + garbageValue = "-1758438210" ) @Export("container") Container container() { return (Container)(this.frame != null ? this.frame : this); } - @ObfuscatedName("ae") + @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(B)Llw;", - garbageValue = "65" + signature = "(I)Llh;", + garbageValue = "1983468330" ) @Export("getFrameContentBounds") Bounds getFrameContentBounds() { Container var1 = this.container(); - int var2 = Math.max(var1.getWidth(), this.field442); - int var3 = Math.max(var1.getHeight(), this.field455); + int var2 = Math.max(var1.getWidth(), this.field422); + int var3 = Math.max(var1.getHeight(), this.field419); if (this.frame != null) { Insets var4 = this.frame.getInsets(); var2 -= var4.right + var4.left; @@ -825,48 +839,29 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene return new Bounds(var2, var3); } - @ObfuscatedName("aj") + @ObfuscatedName("am") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-934815852" + signature = "(B)Z", + garbageValue = "67" ) @Export("hasFrame") protected final boolean hasFrame() { return this.frame != null; } - @ObfuscatedName("an") + @ObfuscatedName("bj") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1314130629" + garbageValue = "-1677674321" ) - protected abstract void vmethod1301(); - - public final void destroy() { - if (this == gameShell && !isKilled) { - stopTimeMs = TaskHandler.currentTimeMillis(); - long var1 = 4999L; - - try { - Thread.sleep(var1); - } catch (InterruptedException var5) { - } - - try { - Thread.sleep(1L); - } catch (InterruptedException var4) { - } - - this.kill(); - } - } + protected abstract void vmethod1290(); public final synchronized void paint(Graphics var1) { if (this == gameShell && !isKilled) { - this.field451 = true; - if (TaskHandler.currentTimeMillis() - this.field463 > 1000L) { + this.field441 = true; + if (WorldMapID.currentTimeMillis() - this.field418 > 1000L) { Rectangle var2 = var1.getClipBounds(); - if (var2 == null || var2.width >= BoundaryObject.canvasWidth && var2.height >= WorldMapCacheName.canvasHeight) { + if (var2 == null || var2.width >= GrandExchangeOfferTotalQuantityComparator.canvasWidth && var2.height >= AttackOption.canvasHeight) { this.isCanvasInvalid = true; } } @@ -874,12 +869,14 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } } - public final void windowClosing(WindowEvent var1) { - this.destroy(); + public final void destroy() { + if (this == gameShell && !isKilled) { + stopTimeMs = WorldMapID.currentTimeMillis(); + ServerBuild.method4111(5000L); + this.kill(); + } } - public abstract void init(); - public void run() { try { if (TaskHandler.javaVendor != null) { @@ -893,11 +890,11 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene if (var2.startsWith("1.6.0_")) { int var3; - for (var3 = 6; var3 < var2.length() && AbstractWorldMapData.isDigit(var2.charAt(var3)); ++var3) { + for (var3 = 6; var3 < var2.length() && class237.isDigit(var2.charAt(var3)); ++var3) { } String var4 = var2.substring(6, var3); - if (Interpreter.isNumber(var4) && SoundCache.parseInt(var4) < 10) { + if (SecureRandomFuture.isNumber(var4) && ArchiveDiskActionHandler.parseInt(var4) < 10) { this.error("wrongjava"); return; } @@ -910,18 +907,10 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.setFocusCycleRoot(true); this.addCanvas(); this.setUp(); + Varps.clock = class30.method540(); - Object var8; - try { - var8 = new NanoClock(); - } catch (Throwable var6) { - var8 = new MilliClock(); - } - - BuddyRankComparator.clock = (Clock)var8; - - while (0L == stopTimeMs || TaskHandler.currentTimeMillis() < stopTimeMs) { - gameCyclesToDo = BuddyRankComparator.clock.wait(cycleDurationMillis, fiveOrOne); + while (0L == stopTimeMs || WorldMapID.currentTimeMillis() < stopTimeMs) { + gameCyclesToDo = Varps.clock.wait(cycleDurationMillis, fiveOrOne); for (int var5 = 0; var5 < gameCyclesToDo; ++var5) { this.clientTick(); @@ -930,8 +919,8 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.graphicsTick(); this.post(this.canvas); } - } catch (Exception var7) { - Calendar.RunException_sendStackTrace((String)null, var7); + } catch (Exception var6) { + DesktopPlatformInfoProvider.RunException_sendStackTrace((String)null, var6); this.error("crash"); } @@ -944,14 +933,19 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } } + public final void update(Graphics var1) { + this.paint(var1); + } + public final void stop() { if (this == gameShell && !isKilled) { - stopTimeMs = TaskHandler.currentTimeMillis() + 4000L; + stopTimeMs = WorldMapID.currentTimeMillis() + 4000L; } } - public final void update(Graphics var1) { - this.paint(var1); + public final void focusGained(FocusEvent var1) { + volatileFocus = true; + this.field441 = true; } public final void focusLost(FocusEvent var1) { @@ -961,111 +955,175 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene public final void windowActivated(WindowEvent var1) { } - public final void windowClosed(WindowEvent var1) { - } - - public final void windowDeiconified(WindowEvent var1) { - } - - public final void windowIconified(WindowEvent var1) { + public final void windowClosing(WindowEvent var1) { + this.destroy(); } public final void windowDeactivated(WindowEvent var1) { } + public final void windowDeiconified(WindowEvent var1) { + } + public final void windowOpened(WindowEvent var1) { } - public final void focusGained(FocusEvent var1) { - volatileFocus = true; - this.field451 = true; + public abstract void init(); + + public final void windowIconified(WindowEvent var1) { } - @ObfuscatedName("z") + public final void windowClosed(WindowEvent var1) { + } + + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(ILci;ZB)I", - garbageValue = "8" + signature = "(I)Ljava/security/SecureRandom;", + garbageValue = "115447225" ) - static int method952(int var0, Script var1, boolean var2) { - int var3 = -1; - Widget var4; - if (var0 >= 2000) { - var0 -= 1000; - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var4 = Language.getWidget(var3); - } else { - var4 = var2 ? Interpreter.field1090 : class188.field2352; + static SecureRandom method1069() { + SecureRandom var0 = new SecureRandom(); + var0.nextInt(); + return var0; + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "(II)I", + garbageValue = "-693907391" + ) + @Export("getVarbit") + public static int getVarbit(int var0) { + VarbitDefinition var1 = UserComparator9.method3319(var0); + int var2 = var1.baseVar; + int var3 = var1.startBit; + int var4 = var1.endBit; + int var5 = Varps.Varps_masks[var4 - var3]; + return Varps.Varps_main[var2] >> var3 & var5; + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "907753362" + ) + @Export("addChatMessage") + static void addChatMessage(int var0, String var1, String var2, String var3) { + ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); + if (var4 == null) { + var4 = new ChatChannel(); + Messages.Messages_channels.put(var0, var4); } - if (var0 == ScriptOpcodes.CC_SETPOSITION) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 4; - var4.rawX = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var4.rawY = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - var4.xAlignment = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 2]; - var4.yAlignment = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 3]; - ScriptEvent.invalidateWidget(var4); - AbstractWorldMapIcon.client.alignWidget(var4); - if (var3 != -1 && var4.type == 0) { - MilliClock.revalidateWidgetScroll(FloorDecoration.Widget_interfaceComponents[var3 >> 16], var4, false); + Message var5 = var4.addMessage(var0, var1, var2, var3); + Messages.Messages_hashTable.put(var5, (long)var5.count); + Messages.Messages_queue.add(var5); + Client.chatCycle = Client.cycleCntr; + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(IIII)I", + garbageValue = "-1840068050" + ) + @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("m") + @ObfuscatedSignature( + signature = "(ILcu;ZB)I", + garbageValue = "34" + ) + static int method1068(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { + var3 = Tile.getWidget(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.itemId; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { + var3 = Tile.getWidget(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); + if (var3.itemId != -1) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.itemQuantity; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; } return 1; - } else if (var0 == ScriptOpcodes.CC_SETSIZE) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 4; - var4.rawWidth = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var4.rawHeight = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - var4.widthAlignment = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 2]; - var4.heightAlignment = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 3]; - ScriptEvent.invalidateWidget(var4); - AbstractWorldMapIcon.client.alignWidget(var4); - if (var3 != -1 && var4.type == 0) { - MilliClock.revalidateWidgetScroll(FloorDecoration.Widget_interfaceComponents[var3 >> 16], var4, false); + } else if (var0 == ScriptOpcodes.IF_HASSUB) { + int var5 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var5); + if (var4 != null) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; } return 1; - } else if (var0 == ScriptOpcodes.CC_SETHIDE) { - boolean var5 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - if (var5 != var4.isHidden) { - var4.isHidden = var5; - ScriptEvent.invalidateWidget(var4); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { - var4.noClickThrough = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { - var4.noScrollThrough = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; + } else if (var0 == ScriptOpcodes.IF_GETTOP) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.rootInterface; return 1; } else { return 2; } } - @ObfuscatedName("p") + @ObfuscatedName("kd") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1734679245" + signature = "(IS)V", + garbageValue = "-12664" ) - public static void method1074() { - if (NetCache.NetCache_socket != null) { - NetCache.NetCache_socket.close(); - } + @Export("Widget_resetModelFrames") + static final void Widget_resetModelFrames(int var0) { + if (MusicPatch.loadInterface(var0)) { + Widget[] var1 = UserComparator7.Widget_interfaceComponents[var0]; + for (int var2 = 0; var2 < var1.length; ++var2) { + Widget var3 = var1[var2]; + if (var3 != null) { + var3.modelFrame = 0; + var3.modelFrameCycle = 0; + } + } + + } } - @ObfuscatedName("fv") + @ObfuscatedName("kh") @ObfuscatedSignature( - signature = "(IZZZI)Lij;", - garbageValue = "-1217554678" + signature = "(B)V", + garbageValue = "-120" ) - @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); + @Export("FriendSystem_invalidateIgnoreds") + static final void FriendSystem_invalidateIgnoreds() { + Iterator var0 = Messages.Messages_hashTable.iterator(); + + while (var0.hasNext()) { + Message var1 = (Message)var0.next(); + var1.clearIsFromIgnored(); + } + + if (Calendar.clanChat != null) { + Calendar.clanChat.invalidateIgnoreds(); } - return new Archive(var4, class30.masterDisk, var0, var1, var2, var3); } } diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java index b60d95e088..8169910b07 100644 --- a/runescape-client/src/main/java/GrandExchangeEvent.java +++ b/runescape-client/src/main/java/GrandExchangeEvent.java @@ -1,39 +1,60 @@ +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("y") +@ObfuscatedName("x") @Implements("GrandExchangeEvent") public class GrandExchangeEvent { - @ObfuscatedName("u") + @ObfuscatedName("ss") + @ObfuscatedSignature( + signature = "Lld;" + ) + @Export("worldMap") + static WorldMap worldMap; + @ObfuscatedName("bs") + @ObfuscatedSignature( + signature = "Lli;" + ) + @Export("worldSelectLeftSprite") + static IndexedSprite worldSelectLeftSprite; + @ObfuscatedName("kx") @ObfuscatedGetter( - intValue = 1903174229 + intValue = -830703967 + ) + @Export("menuX") + static int menuX; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -492844339 ) @Export("world") public final int world; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - longValue = -3619466799124397109L + longValue = 6772397130790099757L ) @Export("age") public final long age; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Li;" + signature = "Ld;" ) @Export("grandExchangeOffer") public final GrandExchangeOffer grandExchangeOffer; - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("offerName") String offerName; - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("previousOfferName") String previousOfferName; @ObfuscatedSignature( - signature = "(Lkg;BI)V" + signature = "(Lkq;BI)V" ) GrandExchangeEvent(Buffer var1, byte var2, int var3) { this.offerName = var1.readStringCp1252NullTerminated(); @@ -43,8 +64,8 @@ public class GrandExchangeEvent { int var4 = var1.readInt(); int var5 = var1.readInt(); this.grandExchangeOffer = new GrandExchangeOffer(); - this.grandExchangeOffer.method109(2); - this.grandExchangeOffer.method110(var2); + this.grandExchangeOffer.method99(2); + this.grandExchangeOffer.method100(var2); this.grandExchangeOffer.unitPrice = var4; this.grandExchangeOffer.totalQuantity = var5; this.grandExchangeOffer.currentQuantity = 0; @@ -52,72 +73,98 @@ public class GrandExchangeEvent { this.grandExchangeOffer.id = var3; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(B)Ljava/lang/String;", - garbageValue = "16" + signature = "(I)Ljava/lang/String;", + garbageValue = "-859042126" ) @Export("getOfferName") public String getOfferName() { return this.offerName; } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(I)Ljava/lang/String;", - garbageValue = "1776036206" + garbageValue = "342302982" ) @Export("getPreviousOfferName") public String getPreviousOfferName() { return this.previousOfferName; } - @ObfuscatedName("f") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lkg;II)V", - garbageValue = "-894744142" + signature = "(Ljava/lang/String;ILjava/lang/String;B)Z", + garbageValue = "-128" ) - public static void method86(Buffer var0, int var1) { - if (JagexCache.JagexCache_randomDat != null) { + static boolean method79(String var0, int var1, String var2) { + if (var1 == 0) { try { - JagexCache.JagexCache_randomDat.seek(0L); - JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); - } catch (Exception var3) { + if (!class50.field410.startsWith("win")) { + throw new Exception(); + } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { + throw new Exception(); + } else { + String var14 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; + + for (int var4 = 0; var4 < var0.length(); ++var4) { + if (var14.indexOf(var0.charAt(var4)) == -1) { + throw new Exception(); + } + } + + Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); + return true; + } + } catch (Throwable var8) { + return false; } - } - - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "(Lkg;II)Ljava/lang/String;", - garbageValue = "808138004" - ) - static String method92(Buffer var0, int var1) { - try { - int var2 = var0.readUShortSmart(); - if (var2 > var1) { - var2 = var1; + } else if (var1 == 1) { + try { + Applet var7 = class50.applet; + Object[] var5 = new Object[]{(new URL(class50.applet.getCodeBase(), var0)).toString()}; + Object var13 = JSObject.getWindow(var7).call(var2, var5); + return var13 != null; + } catch (Throwable var9) { + return false; + } + } else if (var1 == 2) { + try { + class50.applet.getAppletContext().showDocument(new URL(class50.applet.getCodeBase(), var0), "_blank"); + return true; + } catch (Exception var10) { + return false; + } + } else if (var1 == 3) { + try { + Applet var3 = class50.applet; + JSObject.getWindow(var3).call("loggedout", (Object[])null); + } catch (Throwable var12) { } - byte[] var3 = new byte[var2]; - var0.offset += class210.huffman.decompress(var0.array, var0.offset, var3, 0, var2); - String var4 = NetCache.decodeStringCp1252(var3, 0, var2); - return var4; - } catch (Exception var6) { - return "Cabbage"; + try { + class50.applet.getAppletContext().showDocument(new URL(class50.applet.getCodeBase(), var0), "_top"); + return true; + } catch (Exception var11) { + return false; + } + } else { + throw new IllegalArgumentException(); } } - @ObfuscatedName("p") + @ObfuscatedName("at") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-357486416" + signature = "(ILht;ZI)V", + garbageValue = "1641094625" ) - static void method91(int var0) { - ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var1 != null) { - var1.remove(); - } + static void method80(int var0, Coord var1, boolean var2) { + WorldMapArea var3 = Canvas.getWorldMap().getMapArea(var0); + int var4 = Message.localPlayer.plane; + int var5 = MusicPatchPcmStream.baseX * 64 + (Message.localPlayer.x >> 7); + int var6 = ScriptEvent.baseY * 64 + (Message.localPlayer.y >> 7); + Coord var7 = new Coord(var4, var5, var6); + Canvas.getWorldMap().method6373(var3, var7, var1, var2); } } diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java index 474f93eaae..a5b6da7169 100644 --- a/runescape-client/src/main/java/GrandExchangeEvents.java +++ b/runescape-client/src/main/java/GrandExchangeEvents.java @@ -7,28 +7,29 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("h") +@ObfuscatedName("e") @Implements("GrandExchangeEvents") public class GrandExchangeEvents { - @ObfuscatedName("f") + @ObfuscatedName("nn") + @ObfuscatedGetter( + intValue = -1329032007 + ) + static int field31; + @ObfuscatedName("i") @Export("GrandExchangeEvents_ageComparator") public static Comparator GrandExchangeEvents_ageComparator; - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("GrandExchangeEvents_priceComparator") public static Comparator GrandExchangeEvents_priceComparator; - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("GrandExchangeEvents_nameComparator") public static Comparator GrandExchangeEvents_nameComparator; - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("GrandExchangeEvents_quantityComparator") public static Comparator GrandExchangeEvents_quantityComparator; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 130975453 - ) - static int field36; - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("events") public final List events; @@ -41,7 +42,7 @@ public class GrandExchangeEvents { } @ObfuscatedSignature( - signature = "(Lkg;Z)V", + signature = "(Lkq;Z)V", garbageValue = "1" ) public GrandExchangeEvents(Buffer var1, boolean var2) { @@ -63,10 +64,10 @@ public class GrandExchangeEvents { } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Ljava/util/Comparator;ZI)V", - garbageValue = "1634803719" + signature = "(Ljava/util/Comparator;ZB)V", + garbageValue = "30" ) @Export("sort") public void sort(Comparator var1, boolean var2) { @@ -78,76 +79,494 @@ public class GrandExchangeEvents { } - @ObfuscatedName("fd") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1784799744" + signature = "(Lbm;II)V", + garbageValue = "-1987798280" ) - static final void method83() { - for (int var0 = 0; var0 < Client.npcCount; ++var0) { - int var1 = Client.npcIndices[var0]; - NPC var2 = Client.npcs[var1]; - if (var2 != null) { - class3.updateActorSequence(var2, var2.definition.size); - } - } - - } - - @ObfuscatedName("jm") - @ObfuscatedSignature( - signature = "(Lhl;IIIIIIS)V", - garbageValue = "3880" - ) - static final void method82(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (Client.field908) { - Client.alternativeScrollbarWidth = 32; + @Export("runScript") + static void runScript(ScriptEvent var0, int var1) { + Object[] var2 = var0.args; + Script var3; + int var17; + if (HorizontalAlignment.isWorldMapEvent(var0.type)) { + WorldMapLabel.worldMapEvent = (WorldMapEvent)var2[0]; + WorldMapElement var4 = GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(WorldMapLabel.worldMapEvent.mapElement); + var3 = class16.getWorldMapScript(var0.type, var4.objectId, var4.category); } else { - Client.alternativeScrollbarWidth = 0; + var17 = (Integer)var2[0]; + var3 = SecureRandomCallable.getScript(var17); } - Client.field908 = false; - int var7; - if (MouseHandler.MouseHandler_currentButton == 1 || !JagexCache.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { - if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { - var0.scrollY -= 4; - ScriptEvent.invalidateWidget(var0); - } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { - var0.scrollY += 4; - ScriptEvent.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; + if (var3 != null) { + class188.Interpreter_intStackSize = 0; + class65.Interpreter_stringStackSize = 0; + var17 = -1; + int[] var5 = var3.opcodes; + int[] var6 = var3.intOperands; + byte var7 = -1; + Interpreter.Interpreter_frameDepth = 0; + Interpreter.field1077 = false; + + try { + int var10; + try { + Interpreter.Interpreter_intLocals = new int[var3.localIntCount]; + int var8 = 0; + class247.Interpreter_stringLocals = new String[var3.localStringCount]; + int var9 = 0; + + int var11; + String var18; + for (var10 = 1; var10 < var2.length; ++var10) { + if (var2[var10] instanceof Integer) { + var11 = (Integer)var2[var10]; + if (var11 == -2147483647) { + var11 = var0.mouseX; + } + + if (var11 == -2147483646) { + var11 = var0.mouseY; + } + + if (var11 == -2147483645) { + var11 = var0.widget != null ? var0.widget.id : -1; + } + + if (var11 == -2147483644) { + var11 = var0.opIndex; + } + + if (var11 == -2147483643) { + var11 = var0.widget != null ? var0.widget.childIndex : -1; + } + + if (var11 == -2147483642) { + var11 = var0.dragTarget != null ? var0.dragTarget.id : -1; + } + + if (var11 == -2147483641) { + var11 = var0.dragTarget != null ? var0.dragTarget.childIndex : -1; + } + + if (var11 == -2147483640) { + var11 = var0.keyTyped; + } + + if (var11 == -2147483639) { + var11 = var0.keyPressed; + } + + Interpreter.Interpreter_intLocals[var8++] = var11; + } else if (var2[var10] instanceof String) { + var18 = (String)var2[var10]; + if (var18.equals("event_opbase")) { + var18 = var0.targetName; + } + + class247.Interpreter_stringLocals[var9++] = var18; + } + } + + var10 = 0; + Interpreter.field1079 = var0.field557; + + 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 = Frames.method3281(var29, var3, var32); + switch(var20) { + case 0: + return; + case 1: + default: + break; + case 2: + throw new IllegalStateException(); + } + } else if (var29 == 0) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var6[var17]; + } else if (var29 == ScriptOpcodes.GET_VARP) { + var11 = var6[var17]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Varps.Varps_main[var11]; + } else if (var29 == ScriptOpcodes.SET_VARP) { + var11 = var6[var17]; + Varps.Varps_main[var11] = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + BufferedSink.changeGameOptions(var11); + } else if (var29 == ScriptOpcodes.SCONST) { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3.stringOperands[var17]; + } else if (var29 == ScriptOpcodes.JUMP) { + var17 += var6[var17]; + } else if (var29 == ScriptOpcodes.IF_ICMPNE) { + class188.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]) { + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.IF_ICMPEQ) { + class188.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]) { + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.IF_ICMPLT) { + class188.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]) { + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.IF_ICMPGT) { + class188.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]) { + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.RETURN) { + if (Interpreter.Interpreter_frameDepth == 0) { + return; + } + + ScriptFrame var34 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; + var3 = var34.script; + var5 = var3.opcodes; + var6 = var3.intOperands; + var17 = var34.pc; + Interpreter.Interpreter_intLocals = var34.intLocals; + class247.Interpreter_stringLocals = var34.stringLocals; + } else if (var29 == ScriptOpcodes.GET_VARBIT) { + var11 = var6[var17]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = GameShell.getVarbit(var11); + } else if (var29 == ScriptOpcodes.SET_VARBIT) { + var11 = var6[var17]; + ChatChannel.method2259(var11, Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); + } else if (var29 == ScriptOpcodes.IF_ICMPLE) { + class188.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]) { + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.IF_ICMPGE) { + class188.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]) { + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.ILOAD) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Interpreter.Interpreter_intLocals[var6[var17]]; + } else if (var29 == ScriptOpcodes.ISTORE) { + Interpreter.Interpreter_intLocals[var6[var17]] = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + } else if (var29 == ScriptOpcodes.SLOAD) { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = class247.Interpreter_stringLocals[var6[var17]]; + } else if (var29 == ScriptOpcodes.SSTORE) { + class247.Interpreter_stringLocals[var6[var17]] = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + } else if (var29 == ScriptOpcodes.JOIN_STRING) { + var11 = var6[var17]; + class65.Interpreter_stringStackSize -= var11; + String var31 = User.method5086(Interpreter.Interpreter_stringStack, class65.Interpreter_stringStackSize, var11); + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var31; + } else if (var29 == ScriptOpcodes.POP_INT) { + --class188.Interpreter_intStackSize; + } else if (var29 == ScriptOpcodes.POP_STRING) { + --class65.Interpreter_stringStackSize; + } else { + int var15; + if (var29 != ScriptOpcodes.INVOKE) { + if (var29 == ScriptOpcodes.GET_VARC_INT) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = MilliClock.varcs.getInt(var6[var17]); + } else if (var29 == ScriptOpcodes.SET_VARC_INT) { + MilliClock.varcs.setInt(var6[var17], Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); + } else if (var29 == ScriptOpcodes.DEFINE_ARRAY) { + var11 = var6[var17] >> 16; + var20 = var6[var17] & 65535; + int var21 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + if (var21 < 0 || var21 > 5000) { + throw new RuntimeException(); + } + + Interpreter.Interpreter_arrayLengths[var11] = var21; + byte var22 = -1; + if (var20 == 105) { + var22 = 0; + } + + for (var15 = 0; var15 < var21; ++var15) { + Interpreter.Interpreter_arrays[var11][var15] = var22; + } + } else if (var29 == ScriptOpcodes.GET_ARRAY_INT) { + var11 = var6[var17]; + var20 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + if (var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) { + throw new RuntimeException(); + } + + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var11][var20]; + } else if (var29 == ScriptOpcodes.SET_ARRAY_INT) { + var11 = var6[var17]; + class188.Interpreter_intStackSize -= 2; + var20 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + if (var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) { + throw new RuntimeException(); + } + + Interpreter.Interpreter_arrays[var11][var20] = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + } else if (var29 == ScriptOpcodes.GET_VARC_STRING_OLD) { + var18 = MilliClock.varcs.getStringOld(var6[var17]); + if (var18 == null) { + var18 = "null"; + } + + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var18; + } else if (var29 == ScriptOpcodes.SET_VARC_STRING_OLD) { + MilliClock.varcs.setStringOld(var6[var17], Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]); + } else if (var29 == ScriptOpcodes.GET_VARC_STRING) { + var18 = MilliClock.varcs.getString(var6[var17]); + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var18; + } else if (var29 == ScriptOpcodes.SET_VARC_STRING) { + MilliClock.varcs.setString(var6[var17], Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]); + } else { + if (var29 != ScriptOpcodes.SWITCH) { + throw new IllegalStateException(); + } + + IterableNodeHashTable var33 = var3.switches[var6[var17]]; + IntegerNode var30 = (IntegerNode)var33.get((long)Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); + if (var30 != null) { + var17 += var30.integer; + } + } + } else { + var11 = var6[var17]; + Script var12 = SecureRandomCallable.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 + (class188.Interpreter_intStackSize - var12.intArgumentCount)]; + } + + for (var15 = 0; var15 < var12.stringArgumentCount; ++var15) { + var14[var15] = Interpreter.Interpreter_stringStack[var15 + (class65.Interpreter_stringStackSize - var12.stringArgumentCount)]; + } + + class188.Interpreter_intStackSize -= var12.intArgumentCount; + class65.Interpreter_stringStackSize -= var12.stringArgumentCount; + ScriptFrame var19 = new ScriptFrame(); + var19.script = var3; + var19.pc = var17; + var19.intLocals = Interpreter.Interpreter_intLocals; + var19.stringLocals = class247.Interpreter_stringLocals; + Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var19; + var3 = var12; + var5 = var12.opcodes; + var6 = var12.intOperands; + var17 = -1; + Interpreter.Interpreter_intLocals = var13; + class247.Interpreter_stringLocals = var14; + } + } + } + } catch (Exception var27) { + StringBuilder var24 = new StringBuilder(30); + var24.append("").append(var3.key).append(" "); + + for (var10 = Interpreter.Interpreter_frameDepth - 1; var10 >= 0; --var10) { + var24.append("").append(Interpreter.Interpreter_frames[var10].script.key).append(" "); + } + + var24.append("").append(var7); + DesktopPlatformInfoProvider.RunException_sendStackTrace(var24.toString(), var27); + } + } finally { + if (Interpreter.field1077) { + Interpreter.field1078 = true; + Clock.method3488(); + Interpreter.field1078 = false; + Interpreter.field1077 = false; } - int var8 = var6 - var2 - 16 - var7 / 2; - int var9 = var3 - 32 - var7; - var0.scrollY = var8 * (var4 - var3) / var9; - ScriptEvent.invalidateWidget(var0); - Client.field908 = 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; - ScriptEvent.invalidateWidget(var0); - } - } - } - @ObfuscatedName("js") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "1838875215" + signature = "(III)I", + garbageValue = "-146870643" ) - @Export("runIntfCloseListeners") - static final void runIntfCloseListeners(int var0, int var1) { - if (UserComparator3.loadInterface(var0)) { - WorldMapIcon_0.runComponentCloseListeners(FloorDecoration.Widget_interfaceComponents[var0], var1); + @Export("ItemContainer_getCount") + static int ItemContainer_getCount(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var2 == null) { + return 0; + } else { + return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; + } + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "(CB)Z", + garbageValue = "0" + ) + static boolean method76(char var0) { + for (int var1 = 0; var1 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var1) { + if (var0 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var1)) { + return true; + } + } + + return false; + } + + @ObfuscatedName("aq") + @ObfuscatedSignature( + signature = "(ILcu;ZI)I", + garbageValue = "1983355550" + ) + static int method72(int var0, Script var1, boolean var2) { + int var3; + int var4; + if (var0 == ScriptOpcodes.ADD) { + class188.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var4 + var3; + return 1; + } else if (var0 == ScriptOpcodes.SUB) { + class188.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3 - var4; + return 1; + } else if (var0 == ScriptOpcodes.MULTIPLY) { + class188.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3 * var4; + return 1; + } else if (var0 == ScriptOpcodes.DIV) { + class188.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3 / var4; + return 1; + } else if (var0 == ScriptOpcodes.RANDOM) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); + return 1; + } else if (var0 == ScriptOpcodes.RANDOMINC) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); + return 1; + } else if (var0 == ScriptOpcodes.INTERPOLATE) { + class188.Interpreter_intStackSize -= 5; + var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + int var5 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 2]; + int var6 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 3]; + int var7 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 4]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3 + (var7 - var5) * (var4 - var3) / (var6 - var5); + return 1; + } else if (var0 == ScriptOpcodes.ADDPERCENT) { + class188.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3 + var4 * var3 / 100; + return 1; + } else if (var0 == ScriptOpcodes.SETBIT) { + class188.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3 | 1 << var4; + return 1; + } else if (var0 == ScriptOpcodes.CLEARBIT) { + class188.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); + return 1; + } else if (var0 == ScriptOpcodes.TESTBIT) { + class188.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.MOD) { + class188.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3 % var4; + return 1; + } else if (var0 == ScriptOpcodes.POW) { + class188.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + if (var3 == 0) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); + } + + return 1; + } else if (var0 == ScriptOpcodes.INVPOW) { + class188.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + if (var3 == 0) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + return 1; + } else { + switch(var4) { + case 0: + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; + break; + case 1: + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3; + break; + case 2: + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); + break; + case 3: + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); + break; + case 4: + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); + break; + default: + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); + } + + return 1; + } + } else if (var0 == ScriptOpcodes.AND) { + class188.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3 & var4; + return 1; + } else if (var0 == ScriptOpcodes.OR) { + class188.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3 | var4; + return 1; + } else if (var0 == ScriptOpcodes.SCALE) { + class188.Interpreter_intStackSize -= 3; + long var9 = (long)Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + long var11 = (long)Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + long var13 = (long)Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 2]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = (int)(var13 * var9 / var11); + return 1; + } else { + return 2; } } } diff --git a/runescape-client/src/main/java/GrandExchangeOffer.java b/runescape-client/src/main/java/GrandExchangeOffer.java index 315c566555..c969bb3fa2 100644 --- a/runescape-client/src/main/java/GrandExchangeOffer.java +++ b/runescape-client/src/main/java/GrandExchangeOffer.java @@ -1,43 +1,59 @@ -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("i") +@ObfuscatedName("d") @Implements("GrandExchangeOffer") public class GrandExchangeOffer { - @ObfuscatedName("u") + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -1279002911 + ) + @Export("musicTrackFileId") + static int musicTrackFileId; + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "Lli;" + ) + static IndexedSprite field64; + @ObfuscatedName("fa") + @ObfuscatedSignature( + signature = "Lko;" + ) + @Export("fontBold12") + static Font fontBold12; + @ObfuscatedName("f") @Export("state") byte state; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1162503983 + intValue = 903381877 ) @Export("id") public int id; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 501595023 + intValue = 1525595903 ) @Export("unitPrice") public int unitPrice; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -483385453 + intValue = -181305079 ) @Export("totalQuantity") public int totalQuantity; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1432604557 + intValue = -1020605845 ) @Export("currentQuantity") public int currentQuantity; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -446179957 + intValue = 824366687 ) @Export("currentPrice") public int currentPrice; @@ -46,7 +62,7 @@ public class GrandExchangeOffer { } @ObfuscatedSignature( - signature = "(Lkg;Z)V", + signature = "(Lkq;Z)V", garbageValue = "0" ) public GrandExchangeOffer(Buffer var1, boolean var2) { @@ -58,42 +74,42 @@ public class GrandExchangeOffer { this.currentPrice = var1.readInt(); } - @ObfuscatedName("f") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "855351335" + garbageValue = "-519143415" ) @Export("status") public int status() { return this.state & 7; } - @ObfuscatedName("b") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "8" + signature = "(I)I", + garbageValue = "-1944649855" ) @Export("type") public int type() { return (this.state & 8) == 8 ? 1 : 0; } - @ObfuscatedName("g") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "6" + signature = "(II)V", + garbageValue = "-26019402" ) - void method109(int var1) { + void method99(int var1) { this.state &= -8; this.state = (byte)(this.state | var1 & 7); } - @ObfuscatedName("z") + @ObfuscatedName("b") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "1915474642" + garbageValue = "-1969903695" ) - void method110(int var1) { + void method100(int var1) { this.state &= -9; if (var1 == 1) { this.state = (byte)(this.state | 8); @@ -101,143 +117,31 @@ public class GrandExchangeOffer { } - @ObfuscatedName("f") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "([BIIII[Lfh;B)V", - garbageValue = "0" + signature = "(IIIII)V", + garbageValue = "-2077652257" ) - static final void method123(byte[] var0, int var1, int var2, int var3, int var4, CollisionMap[] var5) { - int var7; - int var8; - for (int var6 = 0; var6 < 4; ++var6) { - for (var7 = 0; var7 < 64; ++var7) { - for (var8 = 0; var8 < 64; ++var8) { - if (var7 + var1 > 0 && var7 + var1 < 103 && var8 + var2 > 0 && var8 + var2 < 103) { - int[] var10000 = var5[var6].flags[var7 + var1]; - var10000[var2 + var8] &= -16777217; - } - } - } - } - - Buffer var10 = new Buffer(var0); - - for (var7 = 0; var7 < 4; ++var7) { - for (var8 = 0; var8 < 64; ++var8) { - for (int var9 = 0; var9 < 64; ++var9) { - loadTerrain(var10, var7, var8 + var1, var9 + var2, var3, var4, 0); - } - } - } - - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "(Ljava/awt/Component;I)V", - garbageValue = "-625365247" - ) - static void method129(Component var0) { - var0.removeKeyListener(KeyHandler.KeyHandler_instance); - var0.removeFocusListener(KeyHandler.KeyHandler_instance); - KeyHandler.field397 = -1; - } - - @ObfuscatedName("b") - @Export("base37DecodeLong") - public static String base37DecodeLong(long var0) { - if (var0 > 0L && var0 < 6582952005840035281L) { - if (var0 % 37L == 0L) { - return null; - } else { - int var2 = 0; - - for (long var3 = var0; var3 != 0L; var3 /= 37L) { - ++var2; - } - - StringBuilder var5; - char var8; - for (var5 = new StringBuilder(var2); 0L != var0; var5.append(var8)) { - long var6 = var0; - var0 /= 37L; - var8 = class288.base37Table[(int)(var6 - 37L * var0)]; - if (var8 == '_') { - int var9 = var5.length() - 1; - var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); - var8 = 160; - } - } - - var5.reverse(); - var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); - return var5.toString(); - } - } else { - return null; - } - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "(Lkg;IIIIIIB)V", - garbageValue = "85" - ) - @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] = -class188.method3692(var4 + var2 + 932731, var3 + 556238 + 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; + static final void method114(int var0, int var1, int var2, int var3) { + for (int var4 = var1; var4 <= var3 + var1; ++var4) { + for (int var5 = var0; var5 <= var0 + var2; ++var5) { + if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) { + Tiles.field496[0][var5][var4] = 127; + if (var0 == var5 && var5 > 0) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4]; } - 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; + if (var5 == var0 + var2 && var5 < 103) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4]; } - break; - } - if (var7 <= 49) { - Tiles.field499[var1][var2][var3] = var0.readByte(); - Tiles.field500[var1][var2][var3] = (byte)((var7 - 2) / 4); - Tiles.field501[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); - } else if (var7 <= 81) { - Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); - } else { - Tiles.field498[var1][var2][var3] = (byte)(var7 - 81); - } - } - } else { - while (true) { - var7 = var0.readUnsignedByte(); - if (var7 == 0) { - break; - } + if (var4 == var1 && var4 > 0) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1]; + } - if (var7 == 1) { - var0.readUnsignedByte(); - break; - } - - if (var7 <= 49) { - var0.readUnsignedByte(); + if (var4 == var3 + var1 && var4 < 103) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1]; + } } } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java index 14dfbbbc02..c4f2205c6d 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java @@ -1,42 +1,20 @@ 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("o") +@ObfuscatedName("v") @Implements("GrandExchangeOfferAgeComparator") final class GrandExchangeOfferAgeComparator implements Comparator { - @ObfuscatedName("sn") - @ObfuscatedGetter( - intValue = 1973722011 - ) - @Export("foundItemIndex") - static int foundItemIndex; - @ObfuscatedName("dn") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lij;" - ) - @Export("archive0") - static Archive archive0; - @ObfuscatedName("gs") - @Export("regionLandArchiveIds") - static int[] regionLandArchiveIds; - @ObfuscatedName("he") - @ObfuscatedGetter( - intValue = -1622356541 - ) - static int field78; - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(Ly;Ly;I)I", - garbageValue = "1968951579" + signature = "(Lx;Lx;I)I", + garbageValue = "-119535735" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - return var1.age < var2.age ? -1 : (var1.age == var2.age ? 0 : 1); + return var1.age < var2.age ? -1 : (var2.age == var1.age ? 0 : 1); } public boolean equals(Object var1) { @@ -49,98 +27,19 @@ final class GrandExchangeOfferAgeComparator implements Comparator { @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(II)Liy;", - garbageValue = "-1360050328" + signature = "(I)V", + garbageValue = "2135681337" ) - @Export("SequenceDefinition_get") - public static SequenceDefinition SequenceDefinition_get(int var0) { - SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0); - var1 = new SequenceDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); - return var1; - } + public static void method147() { + class117.reflectionChecks = new IterableNodeDeque(); } - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(ILjava/lang/String;Ljava/lang/String;I)V", - garbageValue = "1757015417" - ) - @Export("addGameMessage") - static void addGameMessage(int var0, String var1, String var2) { - SecureRandomCallable.addChatMessage(var0, var1, var2, (String)null); - } - - @ObfuscatedName("f") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "-41" + garbageValue = "28" ) - @Export("WorldMapRegion_clearCachedSprites") - static void WorldMapRegion_clearCachedSprites() { - WorldMapRegion.WorldMapRegion_cachedSprites.clear(); - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(I)Llm;", - garbageValue = "1974052885" - ) - static IndexedSprite method172() { - IndexedSprite var0 = new IndexedSprite(); - var0.width = class325.SpriteBuffer_spriteWidth; - var0.height = UserComparator9.SpriteBuffer_spriteHeight; - var0.xOffset = UrlRequester.SpriteBuffer_xOffsets[0]; - var0.yOffset = class216.SpriteBuffer_yOffsets[0]; - var0.subWidth = class325.SpriteBuffer_spriteWidths[0]; - var0.subHeight = VarcInt.SpriteBuffer_spriteHeights[0]; - var0.palette = class325.SpriteBuffer_spritePalette; - var0.pixels = FillMode.SpriteBuffer_pixels[0]; - PcmPlayer.method2510(); - return var0; - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "(Lbp;B)V", - garbageValue = "14" - ) - @Export("changeWorld") - static void changeWorld(World var0) { - if (var0.isMembersOnly() != Client.isMembersWorld) { - Client.isMembersWorld = var0.isMembersOnly(); - WorldMapCacheName.method637(var0.isMembersOnly()); - } - - Canvas.worldHost = var0.host; - Client.worldId = var0.id; - Client.worldProperties = var0.properties; - SecureRandomCallable.port1 = Client.gameBuild == 0 ? 43594 : var0.id + 40000; - class49.port2 = Client.gameBuild == 0 ? 443 : var0.id + 50000; - WorldMapIcon_0.port3 = SecureRandomCallable.port1; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "(IZII)V", - garbageValue = "-1741540406" - ) - public static final void method170(int var0, boolean var1, int var2) { - if (var0 >= 8000 && var0 <= 48000) { - Messages.PcmPlayer_sampleRate = var0; - PcmPlayer.PcmPlayer_stereo = var1; - RouteStrategy.field2114 = var2; - } else { - throw new IllegalArgumentException(); - } + public static void method146() { + StructDefinition.StructDefinition_cached.clear(); } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java index b69545827e..e1b019c331 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java @@ -1,624 +1,291 @@ +import java.io.File; 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("x") +@ObfuscatedName("o") @Implements("GrandExchangeOfferNameComparator") final class GrandExchangeOfferNameComparator implements Comparator { - @ObfuscatedName("ew") - @ObfuscatedGetter( - intValue = -2040766613 - ) - static int field73; - - @ObfuscatedName("u") + @ObfuscatedName("i") + @Export("FileSystem_cacheDir") + static File FileSystem_cacheDir; + @ObfuscatedName("ef") @ObfuscatedSignature( - signature = "(Ly;Ly;B)I", - garbageValue = "-36" + signature = "Lif;" + ) + @Export("archive17") + static Archive archive17; + + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "(Lx;Lx;I)I", + garbageValue = "1230238028" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.getOfferName().compareTo(var2.getOfferName()); } - 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("u") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1232300438" - ) - static void method153() { - if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) { - KeyHandler.KeyHandler_keyCodes[186] = 57; - KeyHandler.KeyHandler_keyCodes[187] = 27; - KeyHandler.KeyHandler_keyCodes[188] = 71; - KeyHandler.KeyHandler_keyCodes[189] = 26; - KeyHandler.KeyHandler_keyCodes[190] = 72; - KeyHandler.KeyHandler_keyCodes[191] = 73; - KeyHandler.KeyHandler_keyCodes[192] = 58; - KeyHandler.KeyHandler_keyCodes[219] = 42; - KeyHandler.KeyHandler_keyCodes[220] = 74; - KeyHandler.KeyHandler_keyCodes[221] = 43; - KeyHandler.KeyHandler_keyCodes[222] = 59; - KeyHandler.KeyHandler_keyCodes[223] = 28; - } else { - KeyHandler.KeyHandler_keyCodes[44] = 71; - KeyHandler.KeyHandler_keyCodes[45] = 26; - KeyHandler.KeyHandler_keyCodes[46] = 72; - KeyHandler.KeyHandler_keyCodes[47] = 73; - KeyHandler.KeyHandler_keyCodes[59] = 57; - KeyHandler.KeyHandler_keyCodes[61] = 27; - KeyHandler.KeyHandler_keyCodes[91] = 42; - KeyHandler.KeyHandler_keyCodes[92] = 74; - KeyHandler.KeyHandler_keyCodes[93] = 43; - KeyHandler.KeyHandler_keyCodes[192] = 28; - KeyHandler.KeyHandler_keyCodes[222] = 58; - KeyHandler.KeyHandler_keyCodes[520] = 59; - } - + public int compare(Object var1, Object var2) { + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Lby;II)V", - garbageValue = "808339496" + signature = "(Lhz;III)[Lls;", + garbageValue = "-1409771005" ) - @Export("runScript") - static void runScript(ScriptEvent var0, int var1) { - Object[] var2 = var0.args; - Script var3; - int var17; - if (class210.isWorldMapEvent(var0.type)) { - Messages.worldMapEvent = (WorldMapEvent)var2[0]; - WorldMapElement var4 = Varcs.WorldMapElement_get(Messages.worldMapEvent.mapElement); - var3 = class195.getWorldMapScript(var0.type, var4.objectId, var4.category); + @Export("SpriteBuffer_getSpriteArray") + public static Sprite[] SpriteBuffer_getSpriteArray(AbstractArchive var0, int var1, int var2) { + if (!HitSplatDefinition.method4586(var0, var1, var2)) { + return null; } else { - var17 = (Integer)var2[0]; - var3 = class30.getScript(var17); - } + Sprite[] var4 = new Sprite[class325.SpriteBuffer_spriteCount]; - if (var3 != null) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize = 0; - class43.Interpreter_stringStackSize = 0; - var17 = -1; - int[] var5 = var3.opcodes; - int[] var6 = var3.intOperands; - byte var7 = -1; - Interpreter.Interpreter_frameDepth = 0; - Interpreter.field1093 = false; + for (int var5 = 0; var5 < class325.SpriteBuffer_spriteCount; ++var5) { + Sprite var6 = var4[var5] = new Sprite(); + var6.width = class325.SpriteBuffer_spriteWidth; + var6.height = class325.SpriteBuffer_spriteHeight; + var6.xOffset = class325.SpriteBuffer_xOffsets[var5]; + var6.yOffset = class325.SpriteBuffer_yOffsets[var5]; + var6.subWidth = UserComparator1.SpriteBuffer_spriteWidths[var5]; + var6.subHeight = class325.SpriteBuffer_spriteHeights[var5]; + int var7 = var6.subWidth * var6.subHeight; + byte[] var8 = class290.SpriteBuffer_pixels[var5]; + var6.pixels = new int[var7]; - try { - int var10; - try { - Frames.Interpreter_intLocals = new int[var3.localIntCount]; - int var8 = 0; - LoginScreenAnimation.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; - } - - Frames.Interpreter_intLocals[var8++] = var11; - } else if (var2[var10] instanceof String) { - var18 = (String)var2[var10]; - if (var18.equals("event_opbase")) { - var18 = var0.targetName; - } - - LoginScreenAnimation.Interpreter_stringLocals[var9++] = var18; - } - } - - var10 = 0; - Interpreter.field1095 = var0.field577; - - 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 = NetCache.method4397(var29, var3, var32); - switch(var20) { - case 0: - return; - case 1: - default: - break; - case 2: - throw new IllegalStateException(); - } - } else if (var29 == 0) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var6[var17]; - } else if (var29 == ScriptOpcodes.GET_VARP) { - var11 = var6[var17]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Varps.Varps_main[var11]; - } else if (var29 == ScriptOpcodes.SET_VARP) { - var11 = var6[var17]; - Varps.Varps_main[var11] = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - ObjectDefinition.changeGameOptions(var11); - } else if (var29 == ScriptOpcodes.SCONST) { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var3.stringOperands[var17]; - } else if (var29 == ScriptOpcodes.JUMP) { - var17 += var6[var17]; - } else if (var29 == ScriptOpcodes.IF_ICMPNE) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.IF_ICMPEQ) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.IF_ICMPLT) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.IF_ICMPGT) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.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; - Frames.Interpreter_intLocals = var34.intLocals; - LoginScreenAnimation.Interpreter_stringLocals = var34.stringLocals; - } else if (var29 == ScriptOpcodes.GET_VARBIT) { - var11 = var6[var17]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = FileSystem.getVarbit(var11); - } else if (var29 == ScriptOpcodes.SET_VARBIT) { - var11 = var6[var17]; - JagexCache.method3540(var11, Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]); - } else if (var29 == ScriptOpcodes.IF_ICMPLE) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.IF_ICMPGE) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.ILOAD) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Frames.Interpreter_intLocals[var6[var17]]; - } else if (var29 == ScriptOpcodes.ISTORE) { - Frames.Interpreter_intLocals[var6[var17]] = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - } else if (var29 == ScriptOpcodes.SLOAD) { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = LoginScreenAnimation.Interpreter_stringLocals[var6[var17]]; - } else if (var29 == ScriptOpcodes.SSTORE) { - LoginScreenAnimation.Interpreter_stringLocals[var6[var17]] = Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]; - } else if (var29 == ScriptOpcodes.JOIN_STRING) { - var11 = var6[var17]; - class43.Interpreter_stringStackSize -= var11; - String var31 = FontName.method5425(Interpreter.Interpreter_stringStack, class43.Interpreter_stringStackSize, var11); - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var31; - } else if (var29 == ScriptOpcodes.POP_INT) { - --GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize; - } else if (var29 == ScriptOpcodes.POP_STRING) { - --class43.Interpreter_stringStackSize; - } else { - int var15; - if (var29 != ScriptOpcodes.INVOKE) { - if (var29 == ScriptOpcodes.GET_VARC_INT) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = AttackOption.varcs.getInt(var6[var17]); - } else if (var29 == ScriptOpcodes.SET_VARC_INT) { - AttackOption.varcs.setInt(var6[var17], Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]); - } else if (var29 == ScriptOpcodes.DEFINE_ARRAY) { - var11 = var6[var17] >> 16; - var20 = var6[var17] & 65535; - int var21 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.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[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - if (var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) { - throw new RuntimeException(); - } - - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var11][var20]; - } else if (var29 == ScriptOpcodes.SET_ARRAY_INT) { - var11 = var6[var17]; - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var20 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - if (var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) { - throw new RuntimeException(); - } - - Interpreter.Interpreter_arrays[var11][var20] = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - } else if (var29 == ScriptOpcodes.GET_VARC_STRING_OLD) { - var18 = AttackOption.varcs.getStringOld(var6[var17]); - if (var18 == null) { - var18 = "null"; - } - - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var18; - } else if (var29 == ScriptOpcodes.SET_VARC_STRING_OLD) { - AttackOption.varcs.setStringOld(var6[var17], Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]); - } else if (var29 == ScriptOpcodes.GET_VARC_STRING) { - var18 = AttackOption.varcs.getString(var6[var17]); - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var18; - } else if (var29 == ScriptOpcodes.SET_VARC_STRING) { - AttackOption.varcs.setString(var6[var17], Interpreter.Interpreter_stringStack[--class43.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[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]); - if (var30 != null) { - var17 += var30.integer; - } - } - } else { - var11 = var6[var17]; - Script var12 = class30.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 + (GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - var12.intArgumentCount)]; - } - - for (var15 = 0; var15 < var12.stringArgumentCount; ++var15) { - var14[var15] = Interpreter.Interpreter_stringStack[var15 + (class43.Interpreter_stringStackSize - var12.stringArgumentCount)]; - } - - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= var12.intArgumentCount; - class43.Interpreter_stringStackSize -= var12.stringArgumentCount; - ScriptFrame var19 = new ScriptFrame(); - var19.script = var3; - var19.pc = var17; - var19.intLocals = Frames.Interpreter_intLocals; - var19.stringLocals = LoginScreenAnimation.Interpreter_stringLocals; - Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var19; - var3 = var12; - var5 = var12.opcodes; - var6 = var12.intOperands; - var17 = -1; - Frames.Interpreter_intLocals = var13; - LoginScreenAnimation.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); - Calendar.RunException_sendStackTrace(var24.toString(), var27); + for (int var9 = 0; var9 < var7; ++var9) { + var6.pixels[var9] = class268.SpriteBuffer_spritePalette[var8[var9] & 255]; } - } finally { - if (Interpreter.field1093) { - Interpreter.field1087 = true; - Actor.method1756(); - Interpreter.field1087 = false; - Interpreter.field1093 = false; - } - } + + Message.method1223(); + return var4; } } - @ObfuscatedName("z") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkj;II)V", - garbageValue = "1585697176" + signature = "(ILcu;ZB)I", + garbageValue = "-68" ) - @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.field630 = false; - } else if (Client.localPlayerIndex == var1) { - throw new RuntimeException(); - } else { - Players.Players_regions[var1] = (var4.plane << 28) + (class51.baseX * 64 + var4.pathX[0] >> 13 << 14) + (VarcInt.baseY * 64 + var4.pathY[0] >> 13); - if (var4.field965 != -1) { - Players.Players_orientations[var1] = var4.field965; - } else { - Players.Players_orientations[var1] = var4.orientation; - } - - Players.Players_targetIndices[var1] = var4.targetIndex; - Client.players[var1] = null; - if (var0.readBits(1) != 0) { - Client.updateExternalPlayer(var0, var1); - } - - } + static int method134(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { + var0 -= 1000; + var3 = Tile.getWidget(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); } else { - 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; - } + var3 = var2 ? UserComparator7.field1946 : class197.field2398; + } - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { - var4.resetPath(var6, var7); - var4.field630 = false; - } else if (var2) { - var4.field630 = true; - var4.tileX = var6; - var4.tileY = var7; - } else { - var4.field630 = false; - var4.method1255(var6, var7, Players.field1247[var1]); + String var4 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + int[] var5 = null; + if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { + int var6 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + if (var6 > 0) { + for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]) { } + } - } 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; - } + var4 = var4.substring(0, var4.length() - 1); + } - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { - var4.resetPath(var6, var7); - var4.field630 = false; - } else if (var2) { - var4.field630 = true; - var4.tileX = var6; - var4.tileY = var7; - } else { - var4.field630 = false; - var4.method1255(var6, var7, Players.field1247[var1]); - } + Object[] var8 = new Object[var4.length() + 1]; + int var7; + for (var7 = var8.length - 1; var7 >= 1; --var7) { + if (var4.charAt(var7 - 1) == 's') { + var8[var7] = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; } else { - 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; - } + var8[var7] = new Integer(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); + } + } - var9 = var6 & 31; - if (var9 > 15) { - var9 -= 32; - } + var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + if (var7 != -1) { + var8[0] = new Integer(var7); + } else { + var8 = null; + } - var10 = var8 + var4.pathX[0]; - var11 = var9 + var4.pathY[0]; - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { - var4.resetPath(var10, var11); - var4.field630 = false; - } else if (var2) { - var4.field630 = true; - var4.tileX = var10; - var4.tileY = var11; - } else { - var4.field630 = false; - var4.method1255(var10, var11, Players.field1247[var1]); - } + if (var0 == ScriptOpcodes.CC_SETONCLICK) { + var3.onClick = var8; + } else if (var0 == ScriptOpcodes.CC_SETONHOLD) { + var3.onHold = var8; + } else if (var0 == ScriptOpcodes.CC_SETONRELEASE) { + var3.onRelease = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) { + var3.onMouseOver = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) { + var3.onMouseLeave = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDRAG) { + var3.onDrag = var8; + } else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) { + var3.onTargetLeave = var8; + } else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) { + var3.onVarTransmit = var8; + var3.varTransmitTriggers = var5; + } else if (var0 == ScriptOpcodes.CC_SETONTIMER) { + var3.onTimer = var8; + } else if (var0 == ScriptOpcodes.CC_SETONOP) { + var3.onOp = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) { + var3.onDragComplete = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) { + var3.onClickRepeat = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) { + var3.onMouseRepeat = var8; + } else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) { + var3.onInvTransmit = var8; + var3.invTransmitTriggers = var5; + } else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) { + var3.onStatTransmit = var8; + var3.statTransmitTriggers = var5; + } else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) { + var3.onTargetEnter = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { + var3.onScroll = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { + var3.onChatTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONKEY) { + var3.onKey = var8; + } else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { + var3.onFriendTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { + var3.onClanTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { + var3.onMiscTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { + var3.onDialogAbort = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { + var3.onSubChange = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { + var3.onStockTransmit = var8; + } else if (var0 == 1426) { + var3.field2562 = var8; + } else { + if (var0 != ScriptOpcodes.CC_SETONRESIZE) { + return 2; + } - var4.plane = (byte)(var7 + var4.plane & 3); - if (Client.localPlayerIndex == var1) { - ClientPacket.Client_plane = var4.plane; - } + var3.onResize = var8; + } - } else { - var6 = var0.readBits(30); - var7 = var6 >> 28; - var8 = var6 >> 14 & 16383; - var9 = var6 & 16383; - var10 = (class51.baseX * 64 + var8 + var4.pathX[0] & 16383) - class51.baseX * 64; - var11 = (VarcInt.baseY * 64 + var9 + var4.pathY[0] & 16383) - VarcInt.baseY * 64; - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { - var4.resetPath(var10, var11); - var4.field630 = false; - } else if (var2) { - var4.field630 = true; - var4.tileX = var10; - var4.tileY = var11; - } else { - var4.field630 = false; - var4.method1255(var10, var11, Players.field1247[var1]); - } - - var4.plane = (byte)(var7 + var4.plane & 3); - if (Client.localPlayerIndex == var1) { - ClientPacket.Client_plane = var4.plane; - } + var3.hasListener = true; + return 1; + } + @ObfuscatedName("jc") + @ObfuscatedSignature( + signature = "(Lha;III)V", + garbageValue = "527227897" + ) + @Export("clickWidget") + static final void clickWidget(Widget var0, int var1, int var2) { + if (Client.clickedWidget == null && !Client.isMenuOpen) { + if (var0 != null) { + Widget var4 = StudioGame.method4116(var0); + if (var4 == null) { + var4 = var0.parent; } + + if (var4 != null) { + Client.clickedWidget = var0; + var4 = StudioGame.method4116(var0); + if (var4 == null) { + var4 = var0.parent; + } + + Client.clickedWidgetParent = var4; + Client.widgetClickX = var1; + Client.widgetClickY = var2; + WorldMapSection2.widgetDragDuration = 0; + Client.isDraggingWidget = false; + int var5 = GrandExchangeOfferOwnWorldComparator.method1288(); + if (var5 != -1) { + BuddyRankComparator.method3361(var5); + } + + return; + } + } + + } + } + + @ObfuscatedName("kn") + @ObfuscatedSignature( + signature = "(Lha;B)Z", + garbageValue = "26" + ) + static final boolean method136(Widget var0) { + int var1 = var0.contentType; + if (var1 == 205) { + Client.logoutTimer = 250; + return true; + } else { + int var2; + int var3; + if (var1 >= 300 && var1 <= 313) { + var2 = (var1 - 300) / 2; + var3 = var1 & 1; + Client.playerAppearance.changeAppearance(var2, var3 == 1); + } + + if (var1 >= 314 && var1 <= 323) { + var2 = (var1 - 314) / 2; + var3 = var1 & 1; + Client.playerAppearance.method3978(var2, var3 == 1); + } + + if (var1 == 324) { + Client.playerAppearance.changeSex(false); + } + + if (var1 == 325) { + Client.playerAppearance.changeSex(true); + } + + if (var1 == 326) { + PacketBufferNode var4 = class2.getPacketBufferNode(ClientPacket.field2232, Client.packetWriter.isaacCipher); + Client.playerAppearance.write(var4.packetBuffer); + Client.packetWriter.addNode(var4); + return true; + } else { + return false; } } } - @ObfuscatedName("p") + @ObfuscatedName("kl") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1138794576" + signature = "(IIIILls;Lhy;I)V", + garbageValue = "1019176627" ) - public static void method154() { - FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); - } + @Export("drawSpriteOnMinimap") + static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) { + if (var4 != null) { + int var6 = Client.camAngleY & 2047; + int var7 = var3 * var3 + var2 * var2; + if (var7 <= 6400) { + int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; + int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; + int var10 = var9 * var2 + var3 * var8 >> 16; + int var11 = var3 * var9 - var8 * var2 >> 16; + if (var7 > 2500) { + var4.method6251(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths); + } else { + var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); + } - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "121" - ) - static final void method145() { - WorldMapSection2.method347("Your ignore list is full. Max of 100 for free users, and 400 for members"); - } - - @ObfuscatedName("fg") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1975621391" - ) - static final void method157() { - if (Client.field867 != ClientPacket.Client_plane) { - Client.field867 = ClientPacket.Client_plane; - Client.method1746(ClientPacket.Client_plane); + } } - } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java index e9da4da017..dd83a9eea9 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java @@ -5,42 +5,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bw") +@ObfuscatedName("bb") @Implements("GrandExchangeOfferOwnWorldComparator") public class GrandExchangeOfferOwnWorldComparator implements Comparator { - @ObfuscatedName("qx") + @ObfuscatedName("rs") @ObfuscatedGetter( - intValue = 785039360 + intValue = 756915395 ) - static int field639; - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Lez;" - ) - @Export("World_request") - static UrlRequest World_request; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 1039309317 - ) - @Export("loginBoxCenter") - static int loginBoxCenter; - @ObfuscatedName("aa") - @ObfuscatedSignature( - signature = "Llw;" - ) - static Bounds field638; - @ObfuscatedName("u") + static int field623; + @ObfuscatedName("eu") + static int[] field626; + @ObfuscatedName("gf") + @Export("regionMapArchives") + static byte[][] regionMapArchives; + @ObfuscatedName("f") @Export("filterWorlds") boolean filterWorlds; GrandExchangeOfferOwnWorldComparator() { } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Ly;Ly;I)I", - garbageValue = "415242896" + signature = "(Lx;Lx;I)I", + garbageValue = "-1149746990" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -61,464 +49,20 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator { } } - 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("fj") + public boolean equals(Object var1) { + return super.equals(var1); + } + + @ObfuscatedName("ik") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-2027936966" + signature = "(I)I", + garbageValue = "-524151860" ) - @Export("load") - static void load() { - int var0; - if (Client.titleLoadingStage == 0) { - class2.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); - - for (var0 = 0; var0 < 4; ++var0) { - Client.collisionMaps[var0] = new CollisionMap(104, 104); - } - - Interpreter.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) { - GrandExchangeOfferAgeComparator.archive0 = GameShell.newArchive(0, false, true, true); - class43.archive1 = GameShell.newArchive(1, false, true, true); - class288.archive2 = GameShell.newArchive(2, true, false, true); - WorldMapID.archive3 = GameShell.newArchive(3, false, true, true); - SpriteMask.archive4 = GameShell.newArchive(4, false, true, true); - DirectByteArrayCopier.archive5 = GameShell.newArchive(5, true, true, true); - AbstractWorldMapData.archive6 = GameShell.newArchive(6, true, true, true); - ClientPacket.archive7 = GameShell.newArchive(7, false, true, true); - WorldMapRegion.archive8 = GameShell.newArchive(8, false, true, true); - class2.archive9 = GameShell.newArchive(9, false, true, true); - class81.archive10 = GameShell.newArchive(10, false, true, true); - ScriptFrame.archive11 = GameShell.newArchive(11, false, true, true); - class267.archive12 = GameShell.newArchive(12, false, true, true); - class269.archive13 = GameShell.newArchive(13, true, false, true); - class162.archive14 = GameShell.newArchive(14, false, true, true); - class210.archive15 = GameShell.newArchive(15, false, true, true); - AbstractWorldMapIcon.archive17 = GameShell.newArchive(17, true, true, true); - UserComparator9.archive18 = GameShell.newArchive(18, false, true, true); - class13.archive19 = GameShell.newArchive(19, false, true, true); - class60.archive20 = GameShell.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 + GrandExchangeOfferAgeComparator.archive0.percentage() * 4 / 100; - var0 += class43.archive1.percentage() * 4 / 100; - var0 += class288.archive2.percentage() * 2 / 100; - var0 += WorldMapID.archive3.percentage() * 2 / 100; - var0 += SpriteMask.archive4.percentage() * 6 / 100; - var0 += DirectByteArrayCopier.archive5.percentage() * 4 / 100; - var0 += AbstractWorldMapData.archive6.percentage() * 2 / 100; - var0 += ClientPacket.archive7.percentage() * 56 / 100; - var0 += WorldMapRegion.archive8.percentage() * 2 / 100; - var0 += class2.archive9.percentage() * 2 / 100; - var0 += class81.archive10.percentage() * 2 / 100; - var0 += ScriptFrame.archive11.percentage() * 2 / 100; - var0 += class267.archive12.percentage() * 2 / 100; - var0 += class269.archive13.percentage() * 2 / 100; - var0 += class162.archive14.percentage() * 2 / 100; - var0 += class210.archive15.percentage() * 2 / 100; - var0 += class13.archive19.percentage() / 100; - var0 += UserComparator9.archive18.percentage() / 100; - var0 += class60.archive20.percentage() / 100; - var0 += AbstractWorldMapIcon.archive17.method4345() && AbstractWorldMapIcon.archive17.isFullyLoaded() ? 1 : 0; - if (var0 != 100) { - if (var0 != 0) { - Login.Login_loadingText = "Checking for updates - " + var0 + "%"; - } - - Login.Login_loadingPercent = 30; - } else { - class266.method5064(GrandExchangeOfferAgeComparator.archive0, "Animations"); - class266.method5064(class43.archive1, "Skeletons"); - class266.method5064(SpriteMask.archive4, "Sound FX"); - class266.method5064(DirectByteArrayCopier.archive5, "Maps"); - class266.method5064(AbstractWorldMapData.archive6, "Music Tracks"); - class266.method5064(ClientPacket.archive7, "Models"); - class266.method5064(WorldMapRegion.archive8, "Sprites"); - class266.method5064(ScriptFrame.archive11, "Music Jingles"); - class266.method5064(class162.archive14, "Music Samples"); - class266.method5064(class210.archive15, "Music Patches"); - class266.method5064(class13.archive19, "World Map"); - class266.method5064(UserComparator9.archive18, "World Map Geography"); - class266.method5064(class60.archive20, "World Map Ground"); - Actor.spriteIds = new GraphicsDefaults(); - Actor.spriteIds.decode(AbstractWorldMapIcon.archive17); - Login.Login_loadingText = "Loaded update list"; - Login.Login_loadingPercent = 30; - Client.titleLoadingStage = 45; - } - } else if (Client.titleLoadingStage == 45) { - GrandExchangeOfferAgeComparator.method170(22050, !Client.isLowDetail, 2); - MidiPcmStream var33 = new MidiPcmStream(); - var33.method3775(9, 128); - MenuAction.pcmPlayer0 = HealthBarUpdate.method1776(GameShell.taskHandler, 0, 22050); - MenuAction.pcmPlayer0.setStream(var33); - BuddyRankComparator.method3483(class210.archive15, class162.archive14, SpriteMask.archive4, var33); - class60.pcmPlayer1 = HealthBarUpdate.method1776(GameShell.taskHandler, 1, 2048); - ClientPacket.pcmStreamMixer = new PcmStreamMixer(); - class60.pcmPlayer1.setStream(ClientPacket.pcmStreamMixer); - LoginScreenAnimation.decimator = new Decimator(22050, Messages.PcmPlayer_sampleRate); - Login.Login_loadingText = "Prepared sound engine"; - Login.Login_loadingPercent = 35; - Client.titleLoadingStage = 50; - WorldMapID.WorldMapElement_fonts = new Fonts(WorldMapRegion.archive8, class269.archive13); - } else { - int var1; - if (Client.titleLoadingStage == 50) { - FontName[] var32 = new FontName[]{FontName.FontName_verdana13, FontName.FontName_bold12, FontName.FontName_verdana11, FontName.FontName_plain12, FontName.FontName_verdana15, FontName.FontName_plain11}; - var1 = var32.length; - Fonts var28 = WorldMapID.WorldMapElement_fonts; - FontName[] var27 = new FontName[]{FontName.FontName_verdana13, FontName.FontName_bold12, FontName.FontName_verdana11, FontName.FontName_plain12, FontName.FontName_verdana15, FontName.FontName_plain11}; - Client.fontsMap = var28.createMap(var27); - if (Client.fontsMap.size() < var1) { - Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var1 + "%"; - Login.Login_loadingPercent = 40; - } else { - AttackOption.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); - Player.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); - JagexCache.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); - NPC.platformInfo = Client.platformInfoProvider.get(); - Login.Login_loadingText = "Loaded fonts"; - Login.Login_loadingPercent = 40; - Client.titleLoadingStage = 60; - } - } else { - Archive var2; - int var23; - Archive var34; - if (Client.titleLoadingStage == 60) { - var34 = class81.archive10; - var2 = WorldMapRegion.archive8; - var23 = 0; - if (var34.tryLoadFileByNames("title.jpg", "")) { - ++var23; - } - - if (var2.tryLoadFileByNames("logo", "")) { - ++var23; - } - - if (var2.tryLoadFileByNames("logo_deadman_mode", "")) { - ++var23; - } - - if (var2.tryLoadFileByNames("logo_seasonal_mode", "")) { - ++var23; - } - - if (var2.tryLoadFileByNames("titlebox", "")) { - ++var23; - } - - if (var2.tryLoadFileByNames("titlebutton", "")) { - ++var23; - } - - if (var2.tryLoadFileByNames("runes", "")) { - ++var23; - } - - if (var2.tryLoadFileByNames("title_mute", "")) { - ++var23; - } - - if (var2.tryLoadFileByNames("options_radio_buttons,0", "")) { - ++var23; - } - - if (var2.tryLoadFileByNames("options_radio_buttons,2", "")) { - ++var23; - } - - if (var2.tryLoadFileByNames("options_radio_buttons,4", "")) { - ++var23; - } - - if (var2.tryLoadFileByNames("options_radio_buttons,6", "")) { - ++var23; - } - - var2.tryLoadFileByNames("sl_back", ""); - var2.tryLoadFileByNames("sl_flags", ""); - var2.tryLoadFileByNames("sl_arrows", ""); - var2.tryLoadFileByNames("sl_stars", ""); - var2.tryLoadFileByNames("sl_button", ""); - byte var29 = 12; - if (var23 < var29) { - Login.Login_loadingText = "Loading title screen - " + var23 * 100 / var29 + "%"; - Login.Login_loadingPercent = 50; - } else { - Login.Login_loadingText = "Loaded title screen"; - Login.Login_loadingPercent = 50; - class81.updateGameState(5); - Client.titleLoadingStage = 70; - } - } else if (Client.titleLoadingStage == 70) { - if (!class288.archive2.isFullyLoaded()) { - Login.Login_loadingText = "Loading config - " + class288.archive2.loadPercent() + "%"; - Login.Login_loadingPercent = 60; - } else { - Archive var31 = class288.archive2; - FloorOverlayDefinition.FloorOverlayDefinition_archive = var31; - var34 = class288.archive2; - FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var34; - CollisionMap.method3615(class288.archive2, ClientPacket.archive7); - AbstractWorldMapIcon.method625(class288.archive2, ClientPacket.archive7, Client.isLowDetail); - var2 = class288.archive2; - Archive var3 = ClientPacket.archive7; - NPCDefinition.NpcDefinition_archive = var2; - NPCDefinition.NpcDefinition_modelArchive = var3; - NetFileRequest.method4230(class288.archive2); - SoundSystem.method2529(class288.archive2, ClientPacket.archive7, Client.isMembersWorld, AttackOption.fontPlain11); - class83.method2090(class288.archive2, GrandExchangeOfferAgeComparator.archive0, class43.archive1); - Archive var24 = class288.archive2; - Archive var25 = ClientPacket.archive7; - SpotAnimationDefinition.SpotAnimationDefinition_archive = var24; - SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var25; - class185.method3665(class288.archive2); - Archive var6 = class288.archive2; - VarpDefinition.VarpDefinition_archive = var6; - VarpDefinition.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); - Archive var7 = WorldMapID.archive3; - Archive var8 = ClientPacket.archive7; - Archive var9 = WorldMapRegion.archive8; - Archive var10 = class269.archive13; - InvDefinition.Widget_archive = var7; - FriendLoginUpdate.Widget_modelsArchive = var8; - Widget.Widget_spritesArchive = var9; - Widget.Widget_fontsArchive = var10; - FloorDecoration.Widget_interfaceComponents = new Widget[InvDefinition.Widget_archive.getGroupCount()][]; - Widget.Widget_loadedInterfaces = new boolean[InvDefinition.Widget_archive.getGroupCount()]; - Archive var11 = class288.archive2; - InvDefinition.InvDefinition_archive = var11; - PacketBufferNode.method3679(class288.archive2); - Archive var12 = class288.archive2; - VarcInt.VarcInt_archive = var12; - Archive var13 = class288.archive2; - ParamDefinition.ParamDefinition_archive = var13; - AttackOption.varcs = new Varcs(); - Archive var14 = class288.archive2; - Archive var15 = WorldMapRegion.archive8; - Archive var16 = class269.archive13; - HitSplatDefinition.HitSplatDefinition_archive = var14; - HitSplatDefinition.field3328 = var15; - HitSplatDefinition.HitSplatDefinition_fontsArchive = var16; - Player.method1285(class288.archive2, WorldMapRegion.archive8); - Archive var17 = class288.archive2; - Archive var18 = WorldMapRegion.archive8; - class223.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].method4461(); - } - } - } - - Login.Login_loadingText = "Loaded config"; - Login.Login_loadingPercent = 60; - Client.titleLoadingStage = 80; - } - } else if (Client.titleLoadingStage == 80) { - var0 = 0; - if (class40.compass == null) { - class40.compass = class288.SpriteBuffer_getSprite(WorldMapRegion.archive8, Actor.spriteIds.compass, 0); - } else { - ++var0; - } - - if (class225.redHintArrowSprite == null) { - class225.redHintArrowSprite = class288.SpriteBuffer_getSprite(WorldMapRegion.archive8, Actor.spriteIds.field3808, 0); - } else { - ++var0; - } - - IndexedSprite[] var22; - if (GrandExchangeOfferTotalQuantityComparator.mapSceneSprites == null) { - var2 = WorldMapRegion.archive8; - var23 = Actor.spriteIds.mapScenes; - if (!GraphicsObject.method2030(var2, var23, 0)) { - var22 = null; - } else { - var22 = WallDecoration.method3341(); - } - - GrandExchangeOfferTotalQuantityComparator.mapSceneSprites = var22; - } else { - ++var0; - } - - if (FontName.headIconPkSprites == null) { - FontName.headIconPkSprites = UserComparator5.SpriteBuffer_getSpriteArray(WorldMapRegion.archive8, Actor.spriteIds.headIconsPk, 0); - } else { - ++var0; - } - - if (UrlRequest.headIconPrayerSprites == null) { - UrlRequest.headIconPrayerSprites = UserComparator5.SpriteBuffer_getSpriteArray(WorldMapRegion.archive8, Actor.spriteIds.field3799, 0); - } else { - ++var0; - } - - if (SequenceDefinition.headIconHintSprites == null) { - SequenceDefinition.headIconHintSprites = UserComparator5.SpriteBuffer_getSpriteArray(WorldMapRegion.archive8, Actor.spriteIds.field3804, 0); - } else { - ++var0; - } - - if (AttackOption.mapMarkerSprites == null) { - AttackOption.mapMarkerSprites = UserComparator5.SpriteBuffer_getSpriteArray(WorldMapRegion.archive8, Actor.spriteIds.field3805, 0); - } else { - ++var0; - } - - if (KeyHandler.crossSprites == null) { - KeyHandler.crossSprites = UserComparator5.SpriteBuffer_getSpriteArray(WorldMapRegion.archive8, Actor.spriteIds.field3806, 0); - } else { - ++var0; - } - - if (WorldMapData_0.mapDotSprites == null) { - WorldMapData_0.mapDotSprites = UserComparator5.SpriteBuffer_getSpriteArray(WorldMapRegion.archive8, Actor.spriteIds.field3807, 0); - } else { - ++var0; - } - - if (GrandExchangeOfferTotalQuantityComparator.scrollBarSprites == null) { - var2 = WorldMapRegion.archive8; - var23 = Actor.spriteIds.field3800; - if (!GraphicsObject.method2030(var2, var23, 0)) { - var22 = null; - } else { - var22 = WallDecoration.method3341(); - } - - GrandExchangeOfferTotalQuantityComparator.scrollBarSprites = var22; - } else { - ++var0; - } - - if (class192.modIconSprites == null) { - var2 = WorldMapRegion.archive8; - var23 = Actor.spriteIds.field3809; - if (!GraphicsObject.method2030(var2, var23, 0)) { - var22 = null; - } else { - var22 = WallDecoration.method3341(); - } - - class192.modIconSprites = var22; - } else { - ++var0; - } - - if (var0 < 11) { - Login.Login_loadingText = "Loading sprites - " + var0 * 100 / 12 + "%"; - Login.Login_loadingPercent = 70; - } else { - AbstractFont.AbstractFont_modIconSprites = class192.modIconSprites; - class225.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 var4 = (int)(Math.random() * 41.0D) - 20; - GrandExchangeOfferTotalQuantityComparator.mapSceneSprites[0].shiftColors(var4 + var1, var26 + var4, var4 + var23); - Login.Login_loadingText = "Loaded sprites"; - Login.Login_loadingPercent = 70; - Client.titleLoadingStage = 90; - } - } else if (Client.titleLoadingStage == 90) { - if (!class2.archive9.isFullyLoaded()) { - Login.Login_loadingText = "Loading textures - " + "0%"; - Login.Login_loadingPercent = 90; - } else { - JagexCache.textureProvider = new TextureProvider(class2.archive9, WorldMapRegion.archive8, 20, 0.8D, Client.isLowDetail ? 64 : 128); - Rasterizer3D.Rasterizer3D_setTextureLoader(JagexCache.textureProvider); - Rasterizer3D.Rasterizer3D_setBrightness(0.8D); - Client.titleLoadingStage = 100; - } - } else if (Client.titleLoadingStage == 100) { - var0 = JagexCache.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) { - class2.mouseRecorder = new MouseRecorder(); - GameShell.taskHandler.newThreadTask(class2.mouseRecorder, 10); - Login.Login_loadingText = "Loaded input handler"; - Login.Login_loadingPercent = 92; - Client.titleLoadingStage = 120; - } else if (Client.titleLoadingStage == 120) { - if (!class81.archive10.tryLoadFileByNames("huffman", "")) { - Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; - Login.Login_loadingPercent = 94; - } else { - Huffman var21 = new Huffman(class81.archive10.takeFileByNames("huffman", "")); - Messages.method2230(var21); - Login.Login_loadingText = "Loaded wordpack"; - Login.Login_loadingPercent = 94; - Client.titleLoadingStage = 130; - } - } else if (Client.titleLoadingStage == 130) { - if (!WorldMapID.archive3.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + WorldMapID.archive3.loadPercent() * 4 / 5 + "%"; - Login.Login_loadingPercent = 96; - } else if (!class267.archive12.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + (80 + class267.archive12.loadPercent() / 6) + "%"; - Login.Login_loadingPercent = 96; - } else if (!class269.archive13.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + (96 + class269.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 (!class13.archive19.tryLoadGroupByName(WorldMapCacheName.field304.name)) { - Login.Login_loadingText = "Loading world map - " + class13.archive19.groupLoadPercentByName(WorldMapCacheName.field304.name) / 10 + "%"; - } else { - if (WorldMapRegion.worldMap == null) { - WorldMapRegion.worldMap = new WorldMap(); - WorldMapRegion.worldMap.init(class13.archive19, UserComparator9.archive18, class60.archive20, JagexCache.fontBold12, Client.fontsMap, GrandExchangeOfferTotalQuantityComparator.mapSceneSprites); - } - - Login.Login_loadingText = "Loaded world map"; - Client.titleLoadingStage = 150; - } - } else if (Client.titleLoadingStage == 150) { - class81.updateGameState(10); - } - } - } + static final int method1288() { + return Client.menuOptionsCount - 1; } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java index 308aab7966..6f3cd77596 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java @@ -1,94 +1,93 @@ +import java.awt.Component; +import java.awt.image.BufferedImage; +import java.awt.image.PixelGrabber; +import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.Comparator; +import javax.imageio.ImageIO; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("w") +@ObfuscatedName("a") @Implements("GrandExchangeOfferTotalQuantityComparator") final class GrandExchangeOfferTotalQuantityComparator implements Comparator { - @ObfuscatedName("y") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -847322953 + intValue = -113248427 ) - @Export("Interpreter_intStackSize") - static int Interpreter_intStackSize; - @ObfuscatedName("ge") + @Export("canvasWidth") + public static int canvasWidth; + @ObfuscatedName("dw") @ObfuscatedSignature( - signature = "[Llm;" + signature = "Lif;" ) - @Export("mapSceneSprites") - static IndexedSprite[] mapSceneSprites; - @ObfuscatedName("gu") + @Export("archive15") + static Archive archive15; + @ObfuscatedName("fh") + @ObfuscatedGetter( + intValue = 780531471 + ) + static int field47; + @ObfuscatedName("gv") @ObfuscatedSignature( - signature = "[Llm;" + signature = "Lls;" ) - @Export("scrollBarSprites") - static IndexedSprite[] scrollBarSprites; + @Export("compass") + static Sprite compass; - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Ly;Ly;B)I", - garbageValue = "85" + signature = "(Lx;Lx;I)I", + garbageValue = "-247020264" ) @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 boolean equals(Object var1) { - return super.equals(var1); - } - public int compare(Object var1, Object var2) { return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", - garbageValue = "1071559755" - ) - public static String method97(CharSequence var0) { - String var1 = GrandExchangeOffer.base37DecodeLong(Actor.method1773(var0)); - if (var1 == null) { - var1 = ""; - } - - return var1; + public boolean equals(Object var1) { + return super.equals(var1); } - @ObfuscatedName("ke") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Lkg;I)V", - garbageValue = "754530972" + signature = "([BI)Lls;", + garbageValue = "-146383667" ) - static void method104(Buffer var0) { - if (Client.randomDatData != null) { - var0.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); - } else { - byte[] var2 = new byte[24]; + @Export("convertJpgToSprite") + public static final Sprite convertJpgToSprite(byte[] var0) { + BufferedImage var1 = null; - 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); + try { + var1 = ImageIO.read(new ByteArrayInputStream(var0)); + int var2 = var1.getWidth(); + int var3 = var1.getHeight(); + int[] var4 = new int[var3 * var2]; + PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2); + var5.grabPixels(); + return new Sprite(var4, var2, var3); + } catch (IOException var7) { + } catch (InterruptedException var8) { } + + return new Sprite(0, 0); + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(Ljava/awt/Component;I)V", + garbageValue = "-1494911511" + ) + static void method93(Component var0) { + var0.setFocusTraversalKeysEnabled(false); + var0.addKeyListener(KeyHandler.KeyHandler_instance); + var0.addFocusListener(KeyHandler.KeyHandler_instance); } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java index f09f9cc040..7a4cf24848 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java @@ -1,16 +1,29 @@ +import java.io.BufferedReader; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringReader; +import java.io.StringWriter; import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("k") +@ObfuscatedName("c") @Implements("GrandExchangeOfferUnitPriceComparator") final class GrandExchangeOfferUnitPriceComparator implements Comparator { - @ObfuscatedName("u") + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = 815964443 + ) + @Export("KitDefinition_fileCount") + public static int KitDefinition_fileCount; + + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Ly;Ly;B)I", - garbageValue = "72" + signature = "(Lx;Lx;B)I", + garbageValue = "114" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -25,21 +38,139 @@ final class GrandExchangeOfferUnitPriceComparator implements Comparator { return super.equals(var1); } - @ObfuscatedName("b") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkg;I)Ljava/lang/String;", - garbageValue = "2005210038" + signature = "(IB)Lit;", + garbageValue = "62" ) - public static String method142(Buffer var0) { - return GrandExchangeEvent.method92(var0, 32767); + @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("z") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "76" + signature = "(Lkq;Ljava/lang/String;B)I", + garbageValue = "0" ) - public static int method143(int var0) { - return WorldMapSectionType.method271(ViewportMouse.ViewportMouse_entityTags[var0]); + public static int method122(Buffer var0, String var1) { + int var2 = var0.offset; + byte[] var3 = RouteStrategy.method3566(var1); + var0.writeSmartByteShort(var3.length); + var0.offset += class206.huffman.compress(var3, 0, var3.length, var0.array, var0.offset); + return var0.offset - var2; + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "(Ljava/lang/Throwable;B)Ljava/lang/String;", + garbageValue = "41" + ) + static String method124(Throwable var0) throws IOException { + String var1; + if (var0 instanceof RunException) { + RunException var2 = (RunException)var0; + var1 = var2.message + " | "; + var0 = var2.throwable; + } else { + var1 = ""; + } + + StringWriter var12 = new StringWriter(); + PrintWriter var3 = new PrintWriter(var12); + var0.printStackTrace(var3); + var3.close(); + String var4 = var12.toString(); + BufferedReader var5 = new BufferedReader(new StringReader(var4)); + String var6 = var5.readLine(); + + while (true) { + while (true) { + String var7 = var5.readLine(); + if (var7 == null) { + var1 = var1 + "| " + var6; + return var1; + } + + int var8 = var7.indexOf(40); + int var9 = var7.indexOf(41, var8 + 1); + if (var8 >= 0 && var9 >= 0) { + String var10 = var7.substring(var8 + 1, var9); + int var11 = var10.indexOf(".java:"); + if (var11 >= 0) { + var10 = var10.substring(0, var11) + var10.substring(var11 + 5); + var1 = var1 + var10 + ' '; + continue; + } + + var7 = var7.substring(0, var8); + } + + var7 = var7.trim(); + var7 = var7.substring(var7.lastIndexOf(32) + 1); + var7 = var7.substring(var7.lastIndexOf(9) + 1); + var1 = var1 + var7 + ' '; + } + } + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "(III)I", + garbageValue = "-2098166290" + ) + static int method118(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var2 == null) { + return 0; + } else if (var1 == -1) { + return 0; + } else { + int var3 = 0; + + for (int var4 = 0; var4 < var2.quantities.length; ++var4) { + if (var2.ids[var4] == var1) { + var3 += var2.quantities[var4]; + } + } + + return var3; + } + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "(Lha;IIII)V", + garbageValue = "673237004" + ) + @Export("Widget_setKeyRate") + static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { + if (var0.field2631 == null) { + throw new RuntimeException(); + } else { + var0.field2631[var1] = var2; + var0.field2670[var1] = var3; + } + } + + @ObfuscatedName("ix") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1132135504" + ) + @Export("Widget_runOnTargetLeave") + static void Widget_runOnTargetLeave() { + if (Client.isSpellSelected) { + Widget var0 = BZip2State.getWidgetChild(WorldMapDecoration.selectedSpellWidget, Client.selectedSpellChildIndex); + if (var0 != null && var0.onTargetLeave != null) { + ScriptEvent var1 = new ScriptEvent(); + var1.widget = var0; + var1.args = var0.onTargetLeave; + Client.runScriptEvent(var1); + } + + Client.isSpellSelected = false; + LoginPacket.invalidateWidget(var0); + } } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java index 29ea15df58..4e95d4cae0 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java @@ -3,21 +3,21 @@ 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("p") +@ObfuscatedName("b") @Implements("GrandExchangeOfferWorldComparator") final class GrandExchangeOfferWorldComparator implements Comparator { - @ObfuscatedName("lj") + @ObfuscatedName("dn") @ObfuscatedSignature( - signature = "Lhl;" + signature = "Lif;" ) - static Widget field31; + @Export("archive6") + static Archive archive6; - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Ly;Ly;I)I", - garbageValue = "2079397392" + signature = "(Lx;Lx;I)I", + garbageValue = "1333549485" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -32,398 +32,95 @@ final class GrandExchangeOfferWorldComparator implements Comparator { return super.equals(var1); } - @ObfuscatedName("o") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "19" + signature = "(II)V", + garbageValue = "1794257509" ) - static final int method76(int var0, int var1) { - int var2 = var0 + var1 * 57; - var2 ^= var2 << 13; - int var3 = var2 * (var2 * var2 * 15731 + 789221) + 1376312589 & Integer.MAX_VALUE; - return var3 >> 19 & 255; - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - signature = "(ILci;ZI)I", - garbageValue = "-814260497" - ) - static int method78(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 6600) { - var3 = ClientPacket.Client_plane; - int var9 = class51.baseX * 64 + (class215.localPlayer.x >> 7); - int var5 = VarcInt.baseY * 64 + (class215.localPlayer.y >> 7); - Clock.getWorldMap().method6381(var3, var9, var5, true); - return 1; - } else { - WorldMapArea var11; - if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - String var16 = ""; - var11 = Clock.getWorldMap().getMapArea(var3); - if (var11 != null) { - var16 = var11.getExternalName(); - } - - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var16; - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Clock.getWorldMap().setCurrentMapAreaId(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Clock.getWorldMap().getZoomLevel(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Clock.getWorldMap().setZoomPercentage(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Clock.getWorldMap().isCacheLoaded() ? 1 : 0; - return 1; - } else { - Coord var15; - if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { - var15 = new Coord(Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]); - Clock.getWorldMap().setWorldMapPositionTarget(var15.x, var15.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { - var15 = new Coord(Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]); - Clock.getWorldMap().setWorldMapPositionTargetInstant(var15.x, var15.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { - var15 = new Coord(Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]); - Clock.getWorldMap().jumpToSourceCoord(var15.plane, var15.x, var15.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { - var15 = new Coord(Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]); - Clock.getWorldMap().jumpToSourceCoordInstant(var15.plane, var15.x, var15.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Clock.getWorldMap().getDisplayX(); - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Clock.getWorldMap().getDisplayY(); - return 1; - } else { - WorldMapArea var13; - if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var13 = Clock.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var13.getOrigin().packed(); - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var13 = Clock.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = (var13.getRegionHighX() - var13.getRegionLowX() + 1) * 64; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = (var13.getRegionHighY() - var13.getRegionLowY() + 1) * 64; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var13 = Clock.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var13.getRegionLowX() * 64; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var13.getRegionLowY() * 64; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var13.getRegionHighX() * 64 + 64 - 1; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var13.getRegionHighY() * 64 + 64 - 1; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var13 = Clock.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var13.getZoom(); - } - - return 1; - } else if (var0 == 6615) { - var15 = Clock.getWorldMap().getDisplayCoord(); - if (var15 == null) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var15.x; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var15.y; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Clock.getWorldMap().currentMapAreaId(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { - var15 = new Coord(Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]); - var13 = Clock.getWorldMap().getCurrentMapArea(); - if (var13 == null) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1; - return 1; - } else { - int[] var14 = var13.position(var15.plane, var15.x, var15.y); - if (var14 == null) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var14[0]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var14[1]; - } - - return 1; - } - } else { - Coord var7; - if (var0 == 6618) { - var15 = new Coord(Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]); - var13 = Clock.getWorldMap().getCurrentMapArea(); - if (var13 == null) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1; - return 1; - } else { - var7 = var13.coord(var15.x, var15.y); - if (var7 == null) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var7.packed(); - } - - return 1; - } - } else { - Coord var12; - if (var0 == 6619) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var12 = new Coord(Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]); - Canvas.method871(var3, var12, false); - return 1; - } else if (var0 == 6620) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var12 = new Coord(Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]); - Canvas.method871(var3, var12, true); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var12 = new Coord(Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]); - var11 = Clock.getWorldMap().getMapArea(var3); - if (var11 == null) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - return 1; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var11.containsCoord(var12.plane, var12.x, var12.y) ? 1 : 0; - return 1; - } - } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Clock.getWorldMap().getDisplayWith(); - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Clock.getWorldMap().getDisplayHeight(); - return 1; - } else if (var0 == 6623) { - var15 = new Coord(Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]); - var13 = Clock.getWorldMap().mapAreaAtCoord(var15.plane, var15.x, var15.y); - if (var13 == null) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var13.getId(); - } - - return 1; - } else if (var0 == 6624) { - Clock.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]); - return 1; - } else if (var0 == 6625) { - Clock.getWorldMap().resetMaxFlashCount(); - return 1; - } else if (var0 == 6626) { - Clock.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]); - return 1; - } else if (var0 == 6627) { - Clock.getWorldMap().resetCyclesPerFlash(); - return 1; - } else { - boolean var10; - if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { - var10 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - Clock.getWorldMap().setPerpetualFlash(var10); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Clock.getWorldMap().flashElement(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Clock.getWorldMap().flashCategory(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { - Clock.getWorldMap().stopCurrentFlashes(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { - var10 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - Clock.getWorldMap().setElementsDisabled(var10); - return 1; - } else { - boolean var4; - if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1] == 1; - Clock.getWorldMap().disableElement(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1] == 1; - Clock.getWorldMap().setCategoryDisabled(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Clock.getWorldMap().getElementsDisabled() ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Clock.getWorldMap().isElementDisabled(var3) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Clock.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; - return 1; - } else if (var0 == 6638) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var12 = new Coord(Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]); - var7 = Clock.getWorldMap().method6430(var3, var12); - if (var7 == null) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var7.packed(); - } - - return 1; - } else { - AbstractWorldMapIcon var8; - if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { - var8 = Clock.getWorldMap().iconStart(); - if (var8 == null) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var8.getElement(); - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var8.coord2.packed(); - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { - var8 = Clock.getWorldMap().iconNext(); - if (var8 == null) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var8.getElement(); - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var8.coord2.packed(); - } - - return 1; - } else { - WorldMapElement var6; - if (var0 == ScriptOpcodes.MEC_TEXT) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var6 = Varcs.WorldMapElement_get(var3); - if (var6.name == null) { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var6.name; - } - - return 1; - } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var6 = Varcs.WorldMapElement_get(var3); - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var6.textSize; - return 1; - } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var6 = Varcs.WorldMapElement_get(var3); - if (var6 == null) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var6.category; - } - - return 1; - } else if (var0 == ScriptOpcodes.MEC_SPRITE) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var6 = Varcs.WorldMapElement_get(var3); - if (var6 == null) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var6.sprite1; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Messages.worldMapEvent.mapElement; - return 1; - } else if (var0 == 6698) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Messages.worldMapEvent.coord1.packed(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Messages.worldMapEvent.coord2.packed(); - return 1; - } else { - return 2; - } - } - } - } - } - } - } - } - } + static void method70(int var0) { + ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var1 != null) { + var1.remove(); } } - @ObfuscatedName("iv") + @ObfuscatedName("hr") @ObfuscatedSignature( - signature = "(III)Ljava/lang/String;", - garbageValue = "-1702454117" + signature = "(ZLkl;I)V", + garbageValue = "386675414" ) - static final String method77(int var0, int var1) { - int var2 = var1 - var0; - if (var2 < -9) { - return class222.colorStartTag(16711680); - } else if (var2 < -6) { - return class222.colorStartTag(16723968); - } else if (var2 < -3) { - return class222.colorStartTag(16740352); - } else if (var2 < 0) { - return class222.colorStartTag(16756736); - } else if (var2 > 9) { - return class222.colorStartTag(65280); - } else if (var2 > 6) { - return class222.colorStartTag(4259584); - } else if (var2 > 3) { - return class222.colorStartTag(8453888); - } else { - return var2 > 0 ? class222.colorStartTag(12648192) : class222.colorStartTag(16776960); + static final void method71(boolean var0, PacketBuffer var1) { + while (true) { + if (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { + int var2 = var1.readBits(15); + if (var2 != 32767) { + boolean var3 = false; + if (Client.npcs[var2] == null) { + Client.npcs[var2] = new NPC(); + var3 = true; + } + + 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 = Client.defaultRotations[var1.readBits(3)]; + if (var3) { + var4.orientation = var4.rotation = var6; + } + + int var7 = var1.readBits(1); + int var8 = var1.readBits(1); + if (var8 == 1) { + Client.field720[++Client.field673 - 1] = var2; + } + + var4.definition = AbstractUserComparator.getNpcDefinition(var1.readBits(14)); + int var9; + if (var0) { + var9 = var1.readBits(8); + if (var9 > 127) { + var9 -= 256; + } + } else { + var9 = var1.readBits(5); + if (var9 > 15) { + var9 -= 32; + } + } + + var4.field925 = var4.definition.size; + var4.field968 = var4.definition.rotation; + if (var4.field968 == 0) { + var4.rotation = 0; + } + + var4.walkSequence = var4.definition.walkSequence; + var4.walkBackSequence = var4.definition.walkBackSequence; + var4.walkLeftSequence = var4.definition.walkLeftSequence; + var4.walkRightSequence = var4.definition.walkRightSequence; + var4.readySequence = var4.definition.readySequence; + var4.turnLeftSequence = var4.definition.turnLeftSequence; + var4.turnRightSequence = var4.definition.turnRightSequence; + var4.method2045(Message.localPlayer.pathX[0] + var5, Message.localPlayer.pathY[0] + var9, var7 == 1); + continue; + } + } + + var1.exportIndex(); + return; } } } diff --git a/runescape-client/src/main/java/GraphicsDefaults.java b/runescape-client/src/main/java/GraphicsDefaults.java index f14e6cadb7..766a80069e 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("ku") +@ObfuscatedName("kc") @Implements("GraphicsDefaults") public class GraphicsDefaults { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 576730349 + intValue = -1707006757 ) @Export("compass") public int compass; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 262749653 + intValue = 990004197 ) - public int field3808; - @ObfuscatedName("b") + public int field3803; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1408165655 + intValue = -1541922539 ) @Export("mapScenes") public int mapScenes; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -951498167 + intValue = -1405131859 ) @Export("headIconsPk") public int headIconsPk; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = 62857473 - ) - public int field3799; @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1864495415 + intValue = 1085795545 ) - public int field3804; - @ObfuscatedName("h") + public int field3798; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1605363745 - ) - public int field3805; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = -177407337 - ) - public int field3806; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -410491181 + intValue = -1754657277 ) public int field3807; - @ObfuscatedName("i") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -270590657 + intValue = -939471917 ) - public int field3800; - @ObfuscatedName("k") + public int field3804; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 838114045 + intValue = -773091265 ) - public int field3809; + public int field3805; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = -1993061967 + ) + public int field3806; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -1849016603 + ) + public int field3799; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 735486601 + ) + public int field3808; public GraphicsDefaults() { this.compass = -1; - this.field3808 = -1; + this.field3803 = -1; this.mapScenes = -1; this.headIconsPk = -1; - this.field3799 = -1; + this.field3798 = -1; + this.field3807 = -1; this.field3804 = -1; this.field3805 = -1; this.field3806 = -1; - this.field3807 = -1; - this.field3800 = -1; - this.field3809 = -1; + this.field3799 = -1; + this.field3808 = -1; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Lhf;B)V", - garbageValue = "16" + signature = "(Lhz;B)V", + garbageValue = "-29" ) @Export("decode") public void decode(AbstractArchive var1) { - byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3797.group); + byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3796.group); Buffer var3 = new Buffer(var2); while (true) { @@ -101,29 +101,44 @@ public class GraphicsDefaults { var3.readMedium(); break; case 2: - this.compass = var3.method5618(); - this.field3808 = var3.method5618(); - this.mapScenes = var3.method5618(); - this.headIconsPk = var3.method5618(); - this.field3799 = var3.method5618(); - this.field3804 = var3.method5618(); - this.field3805 = var3.method5618(); - this.field3806 = var3.method5618(); - this.field3807 = var3.method5618(); - this.field3800 = var3.method5618(); - this.field3809 = var3.method5618(); + this.compass = var3.method5560(); + this.field3803 = var3.method5560(); + this.mapScenes = var3.method5560(); + this.headIconsPk = var3.method5560(); + this.field3798 = var3.method5560(); + this.field3807 = var3.method5560(); + this.field3804 = var3.method5560(); + this.field3805 = var3.method5560(); + this.field3806 = var3.method5560(); + this.field3799 = var3.method5560(); + this.field3808 = var3.method5560(); } } } - @ObfuscatedName("p") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lhf;Ljava/lang/String;Ljava/lang/String;I)[Lln;", - garbageValue = "-1956835175" + signature = "([BB)V", + garbageValue = "-116" ) - public static Sprite[] method5997(AbstractArchive var0, String var1, String var2) { - int var3 = var0.getGroupId(var1); - int var4 = var0.getFileId(var3, var2); - return UserComparator5.SpriteBuffer_getSpriteArray(var0, var3, var4); + @Export("ByteArrayPool_release") + public static synchronized void ByteArrayPool_release(byte[] var0) { + if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < 1000) { + ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; + } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < 250) { + ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; + } else if (var0.length == 30000 && ByteArrayPool.ByteArrayPool_largeCount < 50) { + ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; + } else { + if (ByteArrayPool.ByteArrayPool_arrays != null) { + for (int var1 = 0; var1 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var1) { + if (var0.length == ByteArrayPool.ByteArrayPool_alternativeSizes[var1] && Interpreter.ByteArrayPool_altSizeArrayCounts[var1] < ByteArrayPool.ByteArrayPool_arrays[var1].length) { + ByteArrayPool.ByteArrayPool_arrays[var1][Interpreter.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; + return; + } + } + } + + } } } diff --git a/runescape-client/src/main/java/GraphicsObject.java b/runescape-client/src/main/java/GraphicsObject.java index 7b6529c50c..ba6c0d6a84 100644 --- a/runescape-client/src/main/java/GraphicsObject.java +++ b/runescape-client/src/main/java/GraphicsObject.java @@ -4,70 +4,70 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bk") +@ObfuscatedName("bp") @Implements("GraphicsObject") public final class GraphicsObject extends Entity { - @ObfuscatedName("by") + @ObfuscatedName("gp") @ObfuscatedSignature( - signature = "[Llm;" + signature = "[Lls;" ) - @Export("worldSelectStars") - static IndexedSprite[] worldSelectStars; - @ObfuscatedName("u") + @Export("headIconPrayerSprites") + static Sprite[] headIconPrayerSprites; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 816767025 + intValue = -1192844989 ) @Export("id") int id; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1764619827 + intValue = -1714996375 ) @Export("cycleStart") int cycleStart; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = -356819999 - ) - @Export("plane") - int plane; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -200533199 - ) - @Export("x") - int x; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = 528585543 - ) - @Export("height") - int height; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = 1230154279 - ) - @Export("y") - int y; - @ObfuscatedName("h") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Liy;" + signature = "Liv;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("y") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1295103123 + intValue = 1267418181 + ) + @Export("plane") + int plane; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -474548897 + ) + @Export("x") + int x; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 60095829 + ) + @Export("y") + int y; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 464992447 + ) + @Export("height") + int height; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -945304711 ) @Export("frame") int frame; - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1745958933 + intValue = 53235765 ) @Export("frameCycle") int frameCycle; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("isFinished") boolean isFinished; @@ -81,20 +81,20 @@ public final class GraphicsObject extends Entity { this.y = var4; this.height = var5; this.cycleStart = var7 + var6; - int var8 = WorldMapRegion.SpotAnimationDefinition_get(this.id).sequence; + int var8 = ClientPacket.SpotAnimationDefinition_get(this.id).sequence; if (var8 != -1) { this.isFinished = false; - this.sequenceDefinition = GrandExchangeOfferAgeComparator.SequenceDefinition_get(var8); + this.sequenceDefinition = WorldMapSection0.SequenceDefinition_get(var8); } else { this.isFinished = true; } } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "(IB)V", - garbageValue = "-93" + garbageValue = "0" ) @Export("advance") final void advance(int var1) { @@ -113,14 +113,14 @@ public final class GraphicsObject extends Entity { } } - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)Ldf;", - garbageValue = "-174129419" + signature = "(I)Ldw;", + garbageValue = "822221372" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = WorldMapRegion.SpotAnimationDefinition_get(this.id); + SpotAnimationDefinition var1 = ClientPacket.SpotAnimationDefinition_get(this.id); Model var2; if (!this.isFinished) { var2 = var1.getModel(this.frame); @@ -131,207 +131,77 @@ public final class GraphicsObject extends Entity { return var2 == null ? null : var2; } - @ObfuscatedName("b") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Lkj;I)V", - garbageValue = "-219604871" + signature = "(Lkl;I)V", + garbageValue = "-2045791963" ) - static final void method2041(PacketBuffer var0) { - int var1 = 0; + @Export("updatePlayer") + static final void updatePlayer(PacketBuffer var0) { var0.importIndex(); + int var1 = Client.localPlayerIndex; + Player var2 = Message.localPlayer = Client.players[var1] = new Player(); + var2.index = var1; + int var3 = var0.readBits(30); + byte var4 = (byte)(var3 >> 28); + int var5 = var3 >> 14 & 16383; + int var6 = var3 & 16383; + var2.pathX[0] = var5 - MusicPatchPcmStream.baseX * 64; + var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); + var2.pathY[0] = var6 - ScriptEvent.baseY * 64; + var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); + UrlRequest.Client_plane = var2.plane = var4; + if (Players.field1228[var1] != null) { + var2.read(Players.field1228[var1]); + } - byte[] var10000; - int var2; - int var3; - int var4; - for (var2 = 0; var2 < Players.Players_count; ++var2) { - var3 = Players.Players_indices[var2]; - if ((Players.field1246[var3] & 1) == 0) { - if (var1 > 0) { - --var1; - var10000 = Players.field1246; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - var4 = var0.readBits(1); - if (var4 == 0) { - var1 = Login.method2124(var0); - var10000 = Players.field1246; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - GrandExchangeOfferNameComparator.readPlayerUpdate(var0, var3); - } - } + Players.Players_count = 0; + Players.Players_indices[++Players.Players_count - 1] = var1; + Players.field1230[var1] = 0; + Players.Players_emptyIdxCount = 0; + + for (int var7 = 1; var7 < 2048; ++var7) { + if (var1 != var7) { + int var8 = var0.readBits(18); + int var9 = var8 >> 16; + int var10 = var8 >> 8 & 597; + int var11 = var8 & 597; + Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28); + Players.Players_orientations[var7] = 0; + Players.Players_targetIndices[var7] = -1; + Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7; + Players.field1230[var7] = 0; } } var0.exportIndex(); - if (var1 != 0) { - throw new RuntimeException(); - } else { - var0.importIndex(); - - for (var2 = 0; var2 < Players.Players_count; ++var2) { - var3 = Players.Players_indices[var2]; - if ((Players.field1246[var3] & 1) != 0) { - if (var1 > 0) { - --var1; - var10000 = Players.field1246; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - var4 = var0.readBits(1); - if (var4 == 0) { - var1 = Login.method2124(var0); - var10000 = Players.field1246; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - GrandExchangeOfferNameComparator.readPlayerUpdate(var0, var3); - } - } - } - } - - var0.exportIndex(); - if (var1 != 0) { - throw new RuntimeException(); - } else { - var0.importIndex(); - - for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { - var3 = Players.Players_emptyIndices[var2]; - if ((Players.field1246[var3] & 1) != 0) { - if (var1 > 0) { - --var1; - var10000 = Players.field1246; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - var4 = var0.readBits(1); - if (var4 == 0) { - var1 = Login.method2124(var0); - var10000 = Players.field1246; - var10000[var3] = (byte)(var10000[var3] | 2); - } else if (Client.updateExternalPlayer(var0, var3)) { - var10000 = Players.field1246; - var10000[var3] = (byte)(var10000[var3] | 2); - } - } - } - } - - var0.exportIndex(); - if (var1 != 0) { - throw new RuntimeException(); - } else { - var0.importIndex(); - - for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { - var3 = Players.Players_emptyIndices[var2]; - if ((Players.field1246[var3] & 1) == 0) { - if (var1 > 0) { - --var1; - var10000 = Players.field1246; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - var4 = var0.readBits(1); - if (var4 == 0) { - var1 = Login.method2124(var0); - var10000 = Players.field1246; - var10000[var3] = (byte)(var10000[var3] | 2); - } else if (Client.updateExternalPlayer(var0, var3)) { - var10000 = Players.field1246; - var10000[var3] = (byte)(var10000[var3] | 2); - } - } - } - } - - var0.exportIndex(); - if (var1 != 0) { - throw new RuntimeException(); - } else { - Players.Players_count = 0; - Players.Players_emptyIdxCount = 0; - - for (var2 = 1; var2 < 2048; ++var2) { - var10000 = Players.field1246; - var10000[var2] = (byte)(var10000[var2] >> 1); - Player var5 = Client.players[var2]; - if (var5 != null) { - Players.Players_indices[++Players.Players_count - 1] = var2; - } else { - Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var2; - } - } - - } - } - } - } } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Ljava/lang/String;II)Z", - garbageValue = "1506076524" + signature = "(Lkq;I)Ljava/lang/String;", + garbageValue = "2062021922" ) - static boolean method2040(String var0, int var1) { - return class237.method4422(var0, var1, "openjs"); + public static String method2028(Buffer var0) { + return class195.method3664(var0, 32767); } - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(Lhf;IIB)Z", - garbageValue = "19" - ) - public static boolean method2030(AbstractArchive var0, int var1, int var2) { - byte[] var3 = var0.takeFile(var1, var2); - if (var3 == null) { - return false; - } else { - Buffer.SpriteBuffer_decode(var3); - return true; - } - } - - @ObfuscatedName("n") + @ObfuscatedName("lo") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1587719078" + garbageValue = "-1979767282" ) - public static void method2039() { - ObjectDefinition.ObjectDefinition_cached.clear(); - ObjectDefinition.ObjectDefinition_cachedModelData.clear(); - ObjectDefinition.ObjectDefinition_cachedEntities.clear(); - ObjectDefinition.ObjectDefinition_cachedModels.clear(); - } + static void method2030() { + if (class215.field2534 != null) { + Client.field749 = Client.cycle; + class215.field2534.method4304(); - @ObfuscatedName("in") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;Lhl;S)Ljava/lang/String;", - garbageValue = "128" - ) - static String method2036(String var0, Widget var1) { - if (var0.indexOf("%") != -1) { - for (int var2 = 1; var2 <= 5; ++var2) { - while (true) { - int var3 = var0.indexOf("%" + var2); - if (var3 == -1) { - break; - } - - String var4 = var0.substring(0, var3); - int var6 = Language.method3719(var1, var2 - 1); - String var5; - if (var6 < 999999999) { - var5 = Integer.toString(var6); - } else { - var5 = "*"; - } - - var0 = var4 + var5 + var0.substring(var3 + 2); + for (int var0 = 0; var0 < Client.players.length; ++var0) { + if (Client.players[var0] != null) { + class215.field2534.method4303(MusicPatchPcmStream.baseX * 64 + (Client.players[var0].x >> 7), ScriptEvent.baseY * 64 + (Client.players[var0].y >> 7)); } } } - return var0; } } diff --git a/runescape-client/src/main/java/HealthBar.java b/runescape-client/src/main/java/HealthBar.java index d971b950d9..f67cff7ebb 100644 --- a/runescape-client/src/main/java/HealthBar.java +++ b/runescape-client/src/main/java/HealthBar.java @@ -1,48 +1,42 @@ 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("cm") +@ObfuscatedName("co") @Implements("HealthBar") public class HealthBar extends Node { - @ObfuscatedName("ay") - @ObfuscatedGetter( - intValue = -1667121911 - ) - static int field1115; - @ObfuscatedName("kt") - @ObfuscatedGetter( - intValue = 751391879 - ) - @Export("menuX") - static int menuX; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Liz;" + signature = "Ldk;" + ) + @Export("soundSystem") + static SoundSystem soundSystem; + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "Lio;" ) @Export("definition") HealthBarDefinition definition; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Ljm;" + signature = "Ljl;" ) @Export("updates") IterableNodeDeque updates; @ObfuscatedSignature( - signature = "(Liz;)V" + signature = "(Lio;)V" ) HealthBar(HealthBarDefinition var1) { this.updates = new IterableNodeDeque(); this.definition = var1; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(IIIIB)V", - garbageValue = "34" + signature = "(IIIII)V", + garbageValue = "76773386" ) @Export("put") void put(int var1, int var2, int var3, int var4) { @@ -75,10 +69,10 @@ public class HealthBar extends Node { } } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(II)Lbl;", - garbageValue = "-1781435459" + signature = "(II)Lbu;", + garbageValue = "-2132773081" ) @Export("get") HealthBarUpdate get(int var1) { @@ -89,7 +83,7 @@ public class HealthBar extends Node { var2 = var3; } - if (this.definition.int5 + var2.cycle + var2.cycleOffset > var1) { + if (this.definition.int5 + var2.cycleOffset + var2.cycle > var1) { return var2; } else { var2.remove(); @@ -100,78 +94,13 @@ public class HealthBar extends Node { } } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "1222201022" + garbageValue = "1427646863" ) @Export("isEmpty") boolean isEmpty() { - return this.updates.method4911(); - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-154641567" - ) - public static void method2054() { - Widget.Widget_cachedSprites.clear(); - Widget.Widget_cachedModels.clear(); - Widget.Widget_cachedFonts.clear(); - Widget.Widget_cachedSpriteMasks.clear(); - } - - @ObfuscatedName("hh") - @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "1071237867" - ) - @Export("updateItemPile") - static final void updateItemPile(int var0, int var1) { - NodeDeque var2 = Client.groundItems[ClientPacket.Client_plane][var0][var1]; - if (var2 == null) { - class2.scene.removeGroundItemPile(ClientPacket.Client_plane, var0, var1); - } else { - long var3 = -99999999L; - TileItem var5 = null; - - TileItem var6; - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { - ItemDefinition var7 = Interpreter.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) { - class2.scene.removeGroundItemPile(ClientPacket.Client_plane, var0, var1); - } else { - var2.addLast(var5); - TileItem var12 = null; - TileItem var11 = null; - - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { - if (var6.id != var5.id) { - if (var12 == null) { - var12 = var6; - } - - if (var12.id != var6.id && var11 == null) { - var11 = var6; - } - } - } - - long var9 = MouseHandler.calculateTag(var0, var1, 3, false, 0); - class2.scene.newGroundItemPile(ClientPacket.Client_plane, var0, var1, class195.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, ClientPacket.Client_plane), var5, var9, var12, var11); - } - } + return this.updates.method4843(); } } diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java index 9c6c4b71c8..908f292e91 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("iz") +@ObfuscatedName("io") @Implements("HealthBarDefinition") public class HealthBarDefinition extends DualNode { - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lhf;" - ) - @Export("HealthBarDefinition_archive") - public static AbstractArchive HealthBarDefinition_archive; @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lhf;" + signature = "Lhz;" + ) + @Export("HealthBarDefinition_archive") + static AbstractArchive HealthBarDefinition_archive; + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "Lhz;" ) @Export("HitSplatDefinition_spritesArchive") static AbstractArchive HitSplatDefinition_spritesArchive; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lef;" + signature = "Leb;" ) @Export("HealthBarDefinition_cached") - public static EvictingDualNodeHashTable HealthBarDefinition_cached; - @ObfuscatedName("g") + static EvictingDualNodeHashTable HealthBarDefinition_cached; + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lef;" + signature = "Leb;" ) @Export("HealthBarDefinition_cachedSprites") static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -857529975 + intValue = -1167570567 ) - public int field3294; - @ObfuscatedName("y") + public int field3249; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1543890887 + intValue = 718576883 ) @Export("int1") public int int1; - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1006919413 + intValue = -34727519 ) @Export("int2") public int int2; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1284122497 + intValue = 1802618683 ) @Export("int3") public int int3; - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1289071467 + intValue = -2121240959 ) @Export("int4") public int int4; - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -658363057 + intValue = 727277 ) @Export("int5") public int int5; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -2107452847 + intValue = -1886911471 ) @Export("frontSpriteID") int frontSpriteID; - @ObfuscatedName("e") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1482452371 + intValue = 821957921 ) @Export("backSpriteID") int backSpriteID; - @ObfuscatedName("n") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1572537397 + intValue = -1979565365 ) @Export("width") public int width; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1358361165 + intValue = -158138215 ) @Export("widthPadding") public int widthPadding; @@ -96,7 +96,7 @@ public class HealthBarDefinition extends DualNode { HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(64); } - public HealthBarDefinition() { + HealthBarDefinition() { this.int1 = 255; this.int2 = 255; this.int3 = -1; @@ -108,13 +108,13 @@ public class HealthBarDefinition extends DualNode { this.widthPadding = 0; } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Lkg;I)V", - garbageValue = "1732750389" + signature = "(Lkq;B)V", + garbageValue = "-127" ) @Export("decode") - public void decode(Buffer var1) { + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { @@ -125,10 +125,10 @@ public class HealthBarDefinition extends DualNode { } } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lkg;II)V", - garbageValue = "-186566893" + signature = "(Lkq;IB)V", + garbageValue = "21" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -145,9 +145,9 @@ public class HealthBarDefinition extends DualNode { } else if (var2 == 6) { var1.readUnsignedByte(); } else if (var2 == 7) { - this.frontSpriteID = var1.method5618(); + this.frontSpriteID = var1.method5560(); } else if (var2 == 8) { - this.backSpriteID = var1.method5618(); + this.backSpriteID = var1.method5560(); } else if (var2 == 11) { this.int3 = var1.readUnsignedShort(); } else if (var2 == 14) { @@ -158,10 +158,10 @@ public class HealthBarDefinition extends DualNode { } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)Lln;", - garbageValue = "621164098" + signature = "(I)Lls;", + garbageValue = "470645524" ) @Export("getFrontSprite") public Sprite getFrontSprite() { @@ -172,7 +172,7 @@ public class HealthBarDefinition extends DualNode { if (var1 != null) { return var1; } else { - var1 = class288.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.frontSpriteID, 0); + var1 = FloorUnderlayDefinition.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.frontSpriteID, 0); if (var1 != null) { HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID); } @@ -182,10 +182,10 @@ public class HealthBarDefinition extends DualNode { } } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(I)Lln;", - garbageValue = "2117531338" + signature = "(I)Lls;", + garbageValue = "-1178717952" ) @Export("getBackSprite") public Sprite getBackSprite() { @@ -196,7 +196,7 @@ public class HealthBarDefinition extends DualNode { if (var1 != null) { return var1; } else { - var1 = class288.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.backSpriteID, 0); + var1 = FloorUnderlayDefinition.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.backSpriteID, 0); if (var1 != null) { HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); } diff --git a/runescape-client/src/main/java/HealthBarUpdate.java b/runescape-client/src/main/java/HealthBarUpdate.java index acd94e8aab..17a2ca0ba7 100644 --- a/runescape-client/src/main/java/HealthBarUpdate.java +++ b/runescape-client/src/main/java/HealthBarUpdate.java @@ -1,41 +1,33 @@ -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("bl") +@ObfuscatedName("bu") @Implements("HealthBarUpdate") public class HealthBarUpdate extends Node { - @ObfuscatedName("iz") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -627572607 - ) - @Export("selectedItemId") - static int selectedItemId; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -8508907 + intValue = -1629160111 ) @Export("cycle") int cycle; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1785180099 + intValue = 618660317 ) @Export("health") int health; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -529706747 + intValue = -717144759 ) @Export("health2") int health2; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1993456701 + intValue = 938888871 ) @Export("cycleOffset") int cycleOffset; @@ -47,10 +39,10 @@ public class HealthBarUpdate extends Node { this.cycleOffset = var4; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(IIIIB)V", - garbageValue = "2" + signature = "(IIIII)V", + garbageValue = "2118505733" ) @Export("set") void set(int var1, int var2, int var3, int var4) { @@ -59,377 +51,4 @@ public class HealthBarUpdate extends Node { this.health2 = var3; this.cycleOffset = var4; } - - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-1436766786" - ) - @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("ad") - @ObfuscatedSignature( - signature = "(Lfu;III)Lde;", - garbageValue = "148025221" - ) - public static final PcmPlayer method1776(TaskHandler var0, int var1, int var2) { - if (Messages.PcmPlayer_sampleRate == 0) { - throw new IllegalStateException(); - } else if (var1 >= 0 && var1 < 2) { - if (var2 < 256) { - var2 = 256; - } - - try { - PcmPlayer var3 = Interpreter.pcmPlayerProvider.player(); - var3.samples = new int[256 * (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; - var3.field1401 = var2; - var3.init(); - var3.capacity = (var2 & -1024) + 1024; - if (var3.capacity > 16384) { - var3.capacity = 16384; - } - - var3.open(var3.capacity); - if (RouteStrategy.field2114 > 0 && PcmPlayer.soundSystem == null) { - PcmPlayer.soundSystem = new SoundSystem(); - PcmPlayer.soundSystemExecutor = Executors.newScheduledThreadPool(1); - PcmPlayer.soundSystemExecutor.scheduleAtFixedRate(PcmPlayer.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); - } - - if (PcmPlayer.soundSystem != null) { - if (PcmPlayer.soundSystem.players[var1] != null) { - throw new IllegalArgumentException(); - } - - PcmPlayer.soundSystem.players[var1] = var3; - } - - return var3; - } catch (Throwable var4) { - return new PcmPlayer(); - } - } else { - throw new IllegalArgumentException(); - } - } - - @ObfuscatedName("hv") - @ObfuscatedSignature( - signature = "(Lgd;I)V", - garbageValue = "1866013369" - ) - static final void method1779(class185 var0) { - PacketBuffer var1 = Client.packetWriter.packetBuffer; - int var2; - int var3; - int var4; - int var5; - int var6; - int var7; - int var8; - if (class185.field2340 == var0) { - var2 = var1.readUnsignedByte(); - var3 = var2 >> 2; - var4 = var2 & 3; - var5 = Client.field703[var3]; - var6 = var1.method5689(); - var7 = (var6 >> 4 & 7) + class227.field3092; - var8 = (var6 & 7) + class40.field343; - if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { - Varps.updatePendingSpawn(ClientPacket.Client_plane, var7, var8, var5, -1, var3, var4, 0, -1); - } - - } else { - int var9; - if (class185.field2337 == var0) { - var2 = var1.method5728(); - var3 = var2 >> 2; - var4 = var2 & 3; - var5 = Client.field703[var3]; - var6 = var1.readUnsignedShort(); - var7 = var1.readUnsignedByte(); - var8 = (var7 >> 4 & 7) + class227.field3092; - var9 = (var7 & 7) + class40.field343; - if (var8 >= 0 && var9 >= 0 && var8 < 104 && var9 < 104) { - Varps.updatePendingSpawn(ClientPacket.Client_plane, var8, var9, var5, var6, var3, var4, 0, -1); - } - - } else { - TileItem var32; - if (class185.field2339 == var0) { - var2 = var1.readUnsignedShort(); - var3 = var1.readUnsignedByte(); - var4 = (var3 >> 4 & 7) + class227.field3092; - var5 = (var3 & 7) + class40.field343; - if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { - NodeDeque var31 = Client.groundItems[ClientPacket.Client_plane][var4][var5]; - if (var31 != null) { - for (var32 = (TileItem)var31.last(); var32 != null; var32 = (TileItem)var31.previous()) { - if ((var2 & 32767) == var32.id) { - var32.remove(); - break; - } - } - - if (var31.last() == null) { - Client.groundItems[ClientPacket.Client_plane][var4][var5] = null; - } - - HealthBar.updateItemPile(var4, var5); - } - } - - } else { - int var10; - if (class185.field2334 == var0) { - var2 = var1.readUnsignedByte(); - var3 = var2 >> 4 & 15; - var4 = var2 & 7; - var5 = var1.method5689(); - var6 = (var5 >> 4 & 7) + class227.field3092; - var7 = (var5 & 7) + class40.field343; - var8 = var1.method5631(); - var9 = var1.readUnsignedShort(); - if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { - var10 = var3 + 1; - if (class215.localPlayer.pathX[0] >= var6 - var10 && class215.localPlayer.pathX[0] <= var10 + var6 && class215.localPlayer.pathY[0] >= var7 - var10 && class215.localPlayer.pathY[0] <= var10 + var7 && Client.areaSoundEffectVolume != 0 && var4 > 0 && Client.soundEffectCount < 50) { - Client.soundEffectIds[Client.soundEffectCount] = var9; - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var4; - Client.queuedSoundEffectDelays[Client.soundEffectCount] = var8; - Client.soundEffects[Client.soundEffectCount] = null; - Client.soundLocations[Client.soundEffectCount] = var3 + (var7 << 8) + (var6 << 16); - ++Client.soundEffectCount; - } - } - } - - int var11; - int var12; - int var13; - int var14; - if (class185.field2336 == var0) { - var2 = var1.method5689(); - var3 = var1.readUnsignedShort(); - var4 = var1.method5719(); - var5 = var1.method5728(); - var6 = (var5 >> 4 & 7) + class227.field3092; - var7 = (var5 & 7) + class40.field343; - byte var37 = var1.readByte(); - var9 = var1.method5689() * 4; - var10 = var1.method5719(); - var11 = var1.method5689() * 4; - var12 = var1.method5643(); - byte var40 = var1.readByte(); - var14 = var1.method5728(); - var8 = var37 + var6; - var13 = var40 + var7; - if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104 && var8 >= 0 && var13 >= 0 && var8 < 104 && var13 < 104 && var4 != 65535) { - var6 = var6 * 128 + 64; - var7 = var7 * 128 + 64; - var8 = var8 * 128 + 64; - var13 = var13 * 128 + 64; - Projectile var15 = new Projectile(var4, ClientPacket.Client_plane, var6, var7, class195.getTileHeight(var6, var7, ClientPacket.Client_plane) - var11, var3 + Client.cycle, var10 + Client.cycle, var14, var2, var12, var9); - var15.setDestination(var8, var13, class195.getTileHeight(var8, var13, ClientPacket.Client_plane) - var9, var3 + Client.cycle); - Client.projectiles.addFirst(var15); - } - - } else if (class185.field2332 == var0) { - var2 = var1.method5640(); - var3 = var1.method5689(); - var4 = (var3 >> 4 & 7) + class227.field3092; - var5 = (var3 & 7) + class40.field343; - var6 = var1.method5728(); - var7 = var6 >> 2; - var8 = var6 & 3; - var9 = Client.field703[var7]; - if (var4 >= 0 && var5 >= 0 && var4 < 103 && var5 < 103) { - if (var9 == 0) { - BoundaryObject var33 = class2.scene.method3130(ClientPacket.Client_plane, var4, var5); - if (var33 != null) { - var11 = ItemContainer.Entity_unpackID(var33.tag); - if (var7 == 2) { - var33.entity1 = new DynamicObject(var11, 2, var8 + 4, ClientPacket.Client_plane, var4, var5, var2, false, var33.entity1); - var33.entity2 = new DynamicObject(var11, 2, var8 + 1 & 3, ClientPacket.Client_plane, var4, var5, var2, false, var33.entity2); - } else { - var33.entity1 = new DynamicObject(var11, var7, var8, ClientPacket.Client_plane, var4, var5, var2, false, var33.entity1); - } - } - } - - if (var9 == 1) { - WallDecoration var41 = class2.scene.method3131(ClientPacket.Client_plane, var4, var5); - if (var41 != null) { - var11 = ItemContainer.Entity_unpackID(var41.tag); - if (var7 != 4 && var7 != 5) { - if (var7 == 6) { - var41.entity1 = new DynamicObject(var11, 4, var8 + 4, ClientPacket.Client_plane, var4, var5, var2, false, var41.entity1); - } else if (var7 == 7) { - var41.entity1 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, ClientPacket.Client_plane, var4, var5, var2, false, var41.entity1); - } else if (var7 == 8) { - var41.entity1 = new DynamicObject(var11, 4, var8 + 4, ClientPacket.Client_plane, var4, var5, var2, false, var41.entity1); - var41.entity2 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, ClientPacket.Client_plane, var4, var5, var2, false, var41.entity2); - } - } else { - var41.entity1 = new DynamicObject(var11, 4, var8, ClientPacket.Client_plane, var4, var5, var2, false, var41.entity1); - } - } - } - - if (var9 == 2) { - GameObject var42 = class2.scene.method3253(ClientPacket.Client_plane, var4, var5); - if (var7 == 11) { - var7 = 10; - } - - if (var42 != null) { - var42.entity = new DynamicObject(ItemContainer.Entity_unpackID(var42.tag), var7, var8, ClientPacket.Client_plane, var4, var5, var2, false, var42.entity); - } - } - - if (var9 == 3) { - FloorDecoration var43 = class2.scene.getFloorDecoration(ClientPacket.Client_plane, var4, var5); - if (var43 != null) { - var43.entity = new DynamicObject(ItemContainer.Entity_unpackID(var43.tag), 22, var8, ClientPacket.Client_plane, var4, var5, var2, false, var43.entity); - } - } - } - - } else if (class185.field2341 == var0) { - var2 = var1.method5640(); - var3 = var1.readUnsignedByte(); - var4 = var1.method5641(); - var5 = var1.readUnsignedByte(); - var6 = (var5 >> 4 & 7) + class227.field3092; - var7 = (var5 & 7) + class40.field343; - if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { - var6 = var6 * 128 + 64; - var7 = var7 * 128 + 64; - GraphicsObject var44 = new GraphicsObject(var2, ClientPacket.Client_plane, var6, var7, class195.getTileHeight(var6, var7, ClientPacket.Client_plane) - var3, var4, Client.cycle); - Client.graphicsObjects.addFirst(var44); - } - - } else if (class185.field2331 == var0) { - var2 = var1.readUnsignedShort(); - var3 = var1.method5641(); - var4 = var1.method5641(); - var5 = var1.method5631(); - var6 = (var5 >> 4 & 7) + class227.field3092; - var7 = (var5 & 7) + class40.field343; - if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { - NodeDeque var34 = Client.groundItems[ClientPacket.Client_plane][var6][var7]; - if (var34 != null) { - for (TileItem var35 = (TileItem)var34.last(); var35 != null; var35 = (TileItem)var34.previous()) { - if ((var2 & 32767) == var35.id && var4 == var35.quantity) { - var35.quantity = var3; - break; - } - } - - HealthBar.updateItemPile(var6, var7); - } - } - - } else if (class185.field2335 == var0) { - var2 = var1.readUnsignedShort(); - var3 = var1.readUnsignedByte(); - var4 = (var3 >> 4 & 7) + class227.field3092; - var5 = (var3 & 7) + class40.field343; - var6 = var1.method5640(); - if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { - var32 = new TileItem(); - var32.id = var6; - var32.quantity = var2; - if (Client.groundItems[ClientPacket.Client_plane][var4][var5] == null) { - Client.groundItems[ClientPacket.Client_plane][var4][var5] = new NodeDeque(); - } - - Client.groundItems[ClientPacket.Client_plane][var4][var5].addFirst(var32); - HealthBar.updateItemPile(var4, var5); - } - - } else { - if (class185.field2333 == var0) { - var2 = var1.readUnsignedShort(); - var3 = var1.method5719(); - var4 = var1.method5689(); - var5 = var4 >> 2; - var6 = var4 & 3; - var7 = Client.field703[var5]; - var8 = var1.method5641(); - byte var38 = var1.method5772(); - byte var39 = var1.method5637(); - var11 = var1.readUnsignedByte(); - var12 = (var11 >> 4 & 7) + class227.field3092; - var13 = (var11 & 7) + class40.field343; - var14 = var1.method5719(); - byte var36 = var1.method5633(); - byte var16 = var1.method5637(); - Player var17; - if (var3 == Client.localPlayerIndex) { - var17 = class215.localPlayer; - } else { - var17 = Client.players[var3]; - } - - if (var17 != null) { - ObjectDefinition var18 = Occluder.getObjectDefinition(var2); - int var19; - int var20; - if (var6 != 1 && var6 != 3) { - var19 = var18.sizeX; - var20 = var18.sizeY; - } else { - var19 = var18.sizeY; - var20 = var18.sizeX; - } - - int var21 = var12 + (var19 >> 1); - int var22 = var12 + (var19 + 1 >> 1); - int var23 = var13 + (var20 >> 1); - int var24 = var13 + (var20 + 1 >> 1); - int[][] var25 = Tiles.Tiles_heights[ClientPacket.Client_plane]; - int var26 = var25[var22][var24] + var25[var22][var23] + var25[var21][var23] + var25[var21][var24] >> 2; - int var27 = (var12 << 7) + (var19 << 6); - int var28 = (var13 << 7) + (var20 << 6); - Model var29 = var18.getModel(var5, var6, var25, var27, var26, var28); - if (var29 != null) { - Varps.updatePendingSpawn(ClientPacket.Client_plane, var12, var13, var7, -1, 0, 0, var8 + 1, var14 + 1); - var17.animationCycleStart = var8 + Client.cycle; - var17.animationCycleEnd = var14 + Client.cycle; - var17.model0 = var29; - var17.field623 = var12 * 128 + var19 * 64; - var17.field617 = var13 * 128 + var20 * 64; - var17.tileHeight2 = var26; - byte var30; - if (var38 > var16) { - var30 = var38; - var38 = var16; - var16 = var30; - } - - if (var36 > var39) { - var30 = var36; - var36 = var39; - var39 = var30; - } - - var17.field618 = var12 + var38; - var17.field621 = var16 + var12; - var17.field620 = var13 + var36; - var17.field622 = var13 + var39; - } - } - } - - } - } - } - } - } } diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java index 5c06f40bb2..af4fbfeea8 100644 --- a/runescape-client/src/main/java/HitSplatDefinition.java +++ b/runescape-client/src/main/java/HitSplatDefinition.java @@ -4,120 +4,119 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ix") +@ObfuscatedName("id") @Implements("HitSplatDefinition") public class HitSplatDefinition extends DualNode { - @ObfuscatedName("u") + @ObfuscatedName("qv") + @ObfuscatedGetter( + intValue = -2106163673 + ) + static int field3312; + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lhf;" + signature = "Lhz;" ) @Export("HitSplatDefinition_archive") public static AbstractArchive HitSplatDefinition_archive; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lhf;" + signature = "Lhz;" ) - public static AbstractArchive field3328; - @ObfuscatedName("b") + public static AbstractArchive field3290; + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lhf;" - ) - @Export("HitSplatDefinition_fontsArchive") - public static AbstractArchive HitSplatDefinition_fontsArchive; - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "Lef;" + signature = "Leb;" ) @Export("HitSplatDefinition_cached") public static EvictingDualNodeHashTable HitSplatDefinition_cached; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lef;" + signature = "Leb;" ) @Export("HitSplatDefinition_cachedSprites") public static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "Lef;" + signature = "Leb;" ) @Export("HitSplatDefinition_cachedFonts") public static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts; - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1295461739 + intValue = 62489831 ) @Export("fontId") int fontId; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 963128035 + intValue = -167444243 ) @Export("textColor") public int textColor; - @ObfuscatedName("e") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1733975883 + intValue = 491261365 ) - public int field3338; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 195481813 - ) - int field3351; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = -1766289865 - ) - int field3340; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -2096395153 - ) - int field3341; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = -994685313 - ) - int field3349; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 634586915 - ) - public int field3343; + public int field3298; @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 139308797 + intValue = -1424505111 ) - public int field3327; + int field3296; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1928448761 + ) + int field3300; @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1876635353 + intValue = -524634903 ) - public int field3348; - @ObfuscatedName("m") - String field3346; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -779748361 - ) - public int field3347; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 1251989255 - ) - public int field3333; - @ObfuscatedName("l") - @Export("transforms") - public int[] transforms; + int field3291; @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1418037543 + intValue = -930676135 + ) + int field3302; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -1984037709 + ) + public int field3303; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 2001520185 + ) + public int field3304; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -1759745425 + ) + public int field3305; + @ObfuscatedName("h") + String field3306; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -1901137879 + ) + public int field3299; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 411378659 + ) + public int field3308; + @ObfuscatedName("r") + @Export("transforms") + public int[] transforms; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -42681817 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("af") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -1584841553 + intValue = 380242275 ) @Export("transformVarp") int transformVarp; @@ -128,31 +127,31 @@ public class HitSplatDefinition extends DualNode { HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(20); } - public HitSplatDefinition() { + HitSplatDefinition() { this.fontId = -1; this.textColor = 16777215; - this.field3338 = 70; - this.field3351 = -1; - this.field3340 = -1; - this.field3341 = -1; - this.field3349 = -1; - this.field3343 = 0; - this.field3327 = 0; - this.field3348 = -1; - this.field3346 = ""; - this.field3347 = -1; - this.field3333 = 0; + this.field3298 = 70; + this.field3296 = -1; + this.field3300 = -1; + this.field3291 = -1; + this.field3302 = -1; + this.field3303 = 0; + this.field3304 = 0; + this.field3305 = -1; + this.field3306 = ""; + this.field3299 = -1; + this.field3308 = 0; this.transformVarbit = -1; this.transformVarp = -1; } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkg;B)V", - garbageValue = "87" + signature = "(Lkq;I)V", + garbageValue = "-13234196" ) @Export("decode") - public void decode(Buffer var1) { + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { @@ -163,41 +162,41 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Lkg;II)V", - garbageValue = "1254085068" + signature = "(Lkq;II)V", + garbageValue = "-1783175438" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { - this.fontId = var1.method5618(); + this.fontId = var1.method5560(); } else if (var2 == 2) { this.textColor = var1.readMedium(); } else if (var2 == 3) { - this.field3351 = var1.method5618(); + this.field3296 = var1.method5560(); } else if (var2 == 4) { - this.field3341 = var1.method5618(); + this.field3291 = var1.method5560(); } else if (var2 == 5) { - this.field3340 = var1.method5618(); + this.field3300 = var1.method5560(); } else if (var2 == 6) { - this.field3349 = var1.method5618(); + this.field3302 = var1.method5560(); } else if (var2 == 7) { - this.field3343 = var1.readShort(); + this.field3303 = var1.readShort(); } else if (var2 == 8) { - this.field3346 = var1.readStringCp1252NullCircumfixed(); + this.field3306 = var1.readStringCp1252NullCircumfixed(); } else if (var2 == 9) { - this.field3338 = var1.readUnsignedShort(); + this.field3298 = var1.readUnsignedShort(); } else if (var2 == 10) { - this.field3327 = var1.readShort(); + this.field3304 = var1.readShort(); } else if (var2 == 11) { - this.field3348 = 0; + this.field3305 = 0; } else if (var2 == 12) { - this.field3347 = var1.readUnsignedByte(); + this.field3299 = var1.readUnsignedByte(); } else if (var2 == 13) { - this.field3333 = var1.readShort(); + this.field3308 = var1.readShort(); } else if (var2 == 14) { - this.field3348 = var1.readUnsignedShort(); + this.field3305 = var1.readUnsignedShort(); } else if (var2 == 17 || var2 == 18) { this.transformVarbit = var1.readUnsignedShort(); if (this.transformVarbit == 65535) { @@ -232,16 +231,16 @@ public class HitSplatDefinition extends DualNode { } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(I)Lix;", - garbageValue = "938920807" + signature = "(S)Lid;", + garbageValue = "1000" ) @Export("transform") public final HitSplatDefinition transform() { int var1 = -1; if (this.transformVarbit != -1) { - var1 = FileSystem.getVarbit(this.transformVarbit); + var1 = GameShell.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -253,36 +252,17 @@ public class HitSplatDefinition extends DualNode { var2 = this.transforms[this.transforms.length - 1]; } - if (var2 != -1) { - HitSplatDefinition var4 = (HitSplatDefinition)HitSplatDefinition_cached.get((long)var2); - HitSplatDefinition var3; - if (var4 != null) { - var3 = var4; - } else { - byte[] var5 = HitSplatDefinition_archive.takeFile(32, var2); - var4 = new HitSplatDefinition(); - if (var5 != null) { - var4.decode(new Buffer(var5)); - } - - HitSplatDefinition_cached.put(var4, (long)var2); - var3 = var4; - } - - return var3; - } else { - return null; - } + return var2 != -1 ? MusicPatchNode.method3815(var2) : null; } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(II)Ljava/lang/String;", - garbageValue = "-1476211586" + garbageValue = "384079116" ) @Export("getString") public String getString(int var1) { - String var2 = this.field3346; + String var2 = this.field3306; while (true) { int var3 = var2.indexOf("%1"); @@ -290,26 +270,26 @@ public class HitSplatDefinition extends DualNode { return var2; } - var2 = var2.substring(0, var3) + VarbitDefinition.intToString(var1, false) + var2.substring(var3 + 2); + var2 = var2.substring(0, var3) + class65.intToString(var1, false) + var2.substring(var3 + 2); } } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(I)Lln;", - garbageValue = "138954957" + signature = "(B)Lls;", + garbageValue = "1" ) - public Sprite method4662() { - if (this.field3351 < 0) { + public Sprite method4600() { + if (this.field3296 < 0) { return null; } else { - Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3351); + Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3296); if (var1 != null) { return var1; } else { - var1 = class288.SpriteBuffer_getSprite(field3328, this.field3351, 0); + var1 = FloorUnderlayDefinition.SpriteBuffer_getSprite(field3290, this.field3296, 0); if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3351); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3296); } return var1; @@ -317,22 +297,22 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(I)Lln;", - garbageValue = "-1751554235" + signature = "(I)Lls;", + garbageValue = "1869434079" ) - public Sprite method4663() { - if (this.field3340 < 0) { + public Sprite method4576() { + if (this.field3300 < 0) { return null; } else { - Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3340); + Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3300); if (var1 != null) { return var1; } else { - var1 = class288.SpriteBuffer_getSprite(field3328, this.field3340, 0); + var1 = FloorUnderlayDefinition.SpriteBuffer_getSprite(field3290, this.field3300, 0); if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3340); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3300); } return var1; @@ -340,22 +320,22 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)Lln;", - garbageValue = "243869561" + signature = "(B)Lls;", + garbageValue = "-53" ) - public Sprite method4671() { - if (this.field3341 < 0) { + public Sprite method4587() { + if (this.field3291 < 0) { return null; } else { - Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3341); + Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3291); if (var1 != null) { return var1; } else { - var1 = class288.SpriteBuffer_getSprite(field3328, this.field3341, 0); + var1 = FloorUnderlayDefinition.SpriteBuffer_getSprite(field3290, this.field3291, 0); if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3341); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3291); } return var1; @@ -363,22 +343,22 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(B)Lln;", - garbageValue = "20" + signature = "(B)Lls;", + garbageValue = "-100" ) - public Sprite method4657() { - if (this.field3349 < 0) { + public Sprite method4596() { + if (this.field3302 < 0) { return null; } else { - Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3349); + Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3302); if (var1 != null) { return var1; } else { - var1 = class288.SpriteBuffer_getSprite(field3328, this.field3349, 0); + var1 = FloorUnderlayDefinition.SpriteBuffer_getSprite(field3290, this.field3302, 0); if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3349); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3302); } return var1; @@ -386,10 +366,10 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I)Lky;", - garbageValue = "-816521399" + signature = "(B)Lko;", + garbageValue = "-24" ) @Export("getFont") public Font getFont() { @@ -400,7 +380,7 @@ public class HitSplatDefinition extends DualNode { if (var1 != null) { return var1; } else { - var1 = class60.method1195(field3328, HitSplatDefinition_fontsArchive, this.fontId, 0); + var1 = class14.method160(field3290, class206.HitSplatDefinition_fontsArchive, this.fontId, 0); if (var1 != null) { HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId); } @@ -409,4 +389,86 @@ public class HitSplatDefinition extends DualNode { } } } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(Lhz;III)Z", + garbageValue = "-1590564834" + ) + public static boolean method4586(AbstractArchive var0, int var1, int var2) { + byte[] var3 = var0.takeFile(var1, var2); + if (var3 == null) { + return false; + } else { + AbstractWorldMapIcon.SpriteBuffer_decode(var3); + return true; + } + } + + @ObfuscatedName("hq") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "1358506990" + ) + static final void method4612() { + PacketBuffer var0 = Client.packetWriter.packetBuffer; + var0.importIndex(); + int var1 = var0.readBits(8); + int var2; + if (var1 < Client.npcCount) { + for (var2 = var1; var2 < Client.npcCount; ++var2) { + Client.field745[++Client.field815 - 1] = Client.npcIndices[var2]; + } + } + + if (var1 > Client.npcCount) { + throw new RuntimeException(""); + } else { + Client.npcCount = 0; + + for (var2 = 0; var2 < var1; ++var2) { + int var3 = Client.npcIndices[var2]; + NPC var4 = Client.npcs[var3]; + int var5 = var0.readBits(1); + if (var5 == 0) { + Client.npcIndices[++Client.npcCount - 1] = var3; + var4.npcCycle = Client.cycle; + } else { + int var6 = var0.readBits(2); + if (var6 == 0) { + Client.npcIndices[++Client.npcCount - 1] = var3; + var4.npcCycle = Client.cycle; + Client.field720[++Client.field673 - 1] = var3; + } else { + int var7; + int var8; + if (var6 == 1) { + Client.npcIndices[++Client.npcCount - 1] = var3; + var4.npcCycle = Client.cycle; + var7 = var0.readBits(3); + var4.method2044(var7, (byte)1); + var8 = var0.readBits(1); + if (var8 == 1) { + Client.field720[++Client.field673 - 1] = var3; + } + } else if (var6 == 2) { + Client.npcIndices[++Client.npcCount - 1] = var3; + var4.npcCycle = Client.cycle; + var7 = var0.readBits(3); + var4.method2044(var7, (byte)2); + var8 = var0.readBits(3); + var4.method2044(var8, (byte)2); + int var9 = var0.readBits(1); + if (var9 == 1) { + Client.field720[++Client.field673 - 1] = var3; + } + } else if (var6 == 3) { + Client.field745[++Client.field815 - 1] = var3; + } + } + } + } + + } + } } diff --git a/runescape-client/src/main/java/HorizontalAlignment.java b/runescape-client/src/main/java/HorizontalAlignment.java index a1447224d6..9ea3b65f84 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("ip") +@ObfuscatedName("iz") @Implements("HorizontalAlignment") public enum HorizontalAlignment implements Enumerated { - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lip;" - ) - field3462(1, 0), @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lip;" + signature = "Liz;" + ) + field3425(0, 0), + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "Liz;" ) @Export("HorizontalAlignment_centered") HorizontalAlignment_centered(2, 1), - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lip;" + signature = "Liz;" ) - field3458(0, 2); + field3424(1, 2); - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1180720231 + intValue = -618314265 ) @Export("value") public final int value; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1019628395 + intValue = 345899471 ) @Export("id") final int id; @@ -42,13 +42,173 @@ public enum HorizontalAlignment implements Enumerated { this.id = var4; } - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "7" + garbageValue = "-57" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } + + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "(II)Z", + garbageValue = "1134986404" + ) + @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("hv") + @ObfuscatedSignature( + signature = "(IIIIII)V", + garbageValue = "1599088353" + ) + @Export("drawObject") + static final void drawObject(int var0, int var1, int var2, int var3, int var4) { + long var5 = class14.scene.getBoundaryObjectTag(var0, var1, var2); + int var7; + int var8; + int var9; + int var10; + int var12; + int var13; + if (var5 != 0L) { + var7 = class14.scene.getObjectFlags(var0, var1, var2, var5); + var8 = var7 >> 6 & 3; + var9 = var7 & 31; + var10 = var3; + if (class42.method790(var5)) { + var10 = var4; + } + + int[] var11 = Language.sceneMinimapSprite.pixels; + var12 = var1 * 4 + (103 - var2) * 2048 + 24624; + var13 = class2.Entity_unpackID(var5); + ObjectDefinition var14 = Coord.getObjectDefinition(var13); + if (var14.mapSceneId != -1) { + IndexedSprite var15 = class162.mapSceneSprites[var14.mapSceneId]; + if (var15 != null) { + int var16 = (var14.sizeX * 4 - var15.subWidth) / 2; + int var17 = (var14.sizeY * 4 - var15.subHeight) / 2; + var15.drawAt(var16 + var1 * 4 + 48, var17 + (104 - var2 - var14.sizeY) * 4 + 48); + } + } else { + if (var9 == 0 || var9 == 2) { + if (var8 == 0) { + var11[var12] = var10; + var11[var12 + 512] = var10; + var11[var12 + 1024] = var10; + var11[var12 + 1536] = var10; + } else if (var8 == 1) { + var11[var12] = var10; + var11[var12 + 1] = var10; + var11[var12 + 2] = var10; + var11[var12 + 3] = var10; + } else if (var8 == 2) { + var11[var12 + 3] = var10; + var11[var12 + 512 + 3] = var10; + var11[var12 + 1024 + 3] = var10; + var11[var12 + 1536 + 3] = var10; + } else if (var8 == 3) { + var11[var12 + 1536] = var10; + var11[var12 + 1536 + 1] = var10; + var11[var12 + 1536 + 2] = var10; + var11[var12 + 1536 + 3] = var10; + } + } + + if (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 = class14.scene.getGameObjectTag(var0, var1, var2); + if (var5 != 0L) { + var7 = class14.scene.getObjectFlags(var0, var1, var2, var5); + var8 = var7 >> 6 & 3; + var9 = var7 & 31; + var10 = class2.Entity_unpackID(var5); + ObjectDefinition var24 = Coord.getObjectDefinition(var10); + int var19; + if (var24.mapSceneId != -1) { + IndexedSprite var18 = class162.mapSceneSprites[var24.mapSceneId]; + if (var18 != null) { + var13 = (var24.sizeX * 4 - var18.subWidth) / 2; + var19 = (var24.sizeY * 4 - var18.subHeight) / 2; + var18.drawAt(var1 * 4 + var13 + 48, (104 - var2 - var24.sizeY) * 4 + var19 + 48); + } + } else if (var9 == 9) { + var12 = 15658734; + if (class42.method790(var5)) { + var12 = 15597568; + } + + int[] var23 = Language.sceneMinimapSprite.pixels; + var19 = var1 * 4 + (103 - var2) * 2048 + 24624; + if (var8 != 0 && var8 != 2) { + var23[var19] = var12; + var23[var19 + 1 + 512] = var12; + var23[var19 + 1024 + 2] = var12; + var23[var19 + 1536 + 3] = var12; + } else { + var23[var19 + 1536] = var12; + var23[var19 + 1 + 1024] = var12; + var23[var19 + 512 + 2] = var12; + var23[var19 + 3] = var12; + } + } + } + + var5 = class14.scene.getFloorDecorationTag(var0, var1, var2); + if (0L != var5) { + var7 = class2.Entity_unpackID(var5); + ObjectDefinition var20 = Coord.getObjectDefinition(var7); + if (var20.mapSceneId != -1) { + IndexedSprite var21 = class162.mapSceneSprites[var20.mapSceneId]; + if (var21 != null) { + var10 = (var20.sizeX * 4 - var21.subWidth) / 2; + int var22 = (var20.sizeY * 4 - var21.subHeight) / 2; + var21.drawAt(var1 * 4 + var10 + 48, var22 + (104 - var2 - var20.sizeY) * 4 + 48); + } + } + } + + } } diff --git a/runescape-client/src/main/java/Huffman.java b/runescape-client/src/main/java/Huffman.java index b543eebcd4..0397b39281 100644 --- a/runescape-client/src/main/java/Huffman.java +++ b/runescape-client/src/main/java/Huffman.java @@ -3,16 +3,16 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hg") +@ObfuscatedName("go") @Implements("Huffman") public class Huffman { - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("masks") int[] masks; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("bits") byte[] bits; - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("keys") int[] keys; @@ -99,10 +99,10 @@ public class Huffman { } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "([BII[BIB)I", - garbageValue = "-1" + signature = "([BII[BII)I", + garbageValue = "918574893" ) @Export("compress") int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) { @@ -150,10 +150,10 @@ public class Huffman { return (var7 + 7 >> 3) - var5; } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "([BI[BIII)I", - garbageValue = "661108656" + garbageValue = "273462814" ) @Export("decompress") int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) { @@ -294,65 +294,212 @@ public class Huffman { } } - @ObfuscatedName("u") - public static final int method4020(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 = (1.0D + var2) * var4; - } else { - var12 = var4 + var2 - var2 * var4; - } + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "2034773594" + ) + public static void method3917() { + VarbitDefinition.VarbitDefinition_cached.clear(); + } - double var14 = 2.0D * var4 - var12; - double var16 = 0.3333333333333333D + var0; - if (var16 > 1.0D) { - --var16; - } + @ObfuscatedName("ig") + @ObfuscatedSignature( + signature = "(IIIIB)V", + garbageValue = "-1" + ) + @Export("addSceneMenuOptions") + static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { + if (Client.isItemSelected == 0 && !Client.isSpellSelected) { + class1.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); + } - double var20 = var0 - 0.3333333333333333D; - if (var20 < 0.0D) { - ++var20; - } + long var4 = -1L; + long var6 = -1L; - if (var16 * 6.0D < 1.0D) { - var6 = var16 * (var12 - var14) * 6.0D + var14; - } else if (var16 * 2.0D < 1.0D) { - var6 = var12; - } else if (3.0D * var16 < 2.0D) { - var6 = 6.0D * (var12 - var14) * (0.6666666666666666D - var16) + var14; - } else { - var6 = var14; - } + int var8; + for (var8 = 0; var8 < class192.method3654(); ++var8) { + long var9 = class14.method152(var8); + if (var9 != var6) { + var6 = var9; + int var23 = class288.method5334(ViewportMouse.ViewportMouse_entityTags[var8]); + int var12 = var23; + int var13 = class117.method2760(var8); + int var14 = CollisionMap.method3555(var8); + int var15 = WorldMapSection2.method322(var8); + if (var14 == 2 && class14.scene.getObjectFlags(UrlRequest.Client_plane, var23, var13, var9) >= 0) { + ObjectDefinition var16 = Coord.getObjectDefinition(var15); + if (var16.transforms != null) { + var16 = var16.transform(); + } - if (var0 * 6.0D < 1.0D) { - var8 = var14 + var0 * (var12 - var14) * 6.0D; - } else if (var0 * 2.0D < 1.0D) { - var8 = var12; - } else if (3.0D * var0 < 2.0D) { - var8 = 6.0D * (0.6666666666666666D - var0) * (var12 - var14) + var14; - } else { - var8 = var14; - } + if (var16 == null) { + continue; + } - if (var20 * 6.0D < 1.0D) { - var10 = var20 * 6.0D * (var12 - var14) + var14; - } else if (var20 * 2.0D < 1.0D) { - var10 = var12; - } else if (var20 * 3.0D < 2.0D) { - var10 = var14 + 6.0D * (var12 - var14) * (0.6666666666666666D - var20); - } else { - var10 = var14; + if (Client.isItemSelected == 1) { + class1.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + NPC.colorStartTag(65535) + var16.name, 1, var15, var23, var13); + } else if (Client.isSpellSelected) { + if ((ReflectionCheck.selectedSpellFlags & 4) == 4) { + class1.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + NPC.colorStartTag(65535) + var16.name, 2, var15, var23, var13); + } + } else { + String[] var24 = var16.actions; + if (var24 != null) { + for (int var25 = 4; var25 >= 0; --var25) { + if (var24[var25] != null) { + short var19 = 0; + if (var25 == 0) { + var19 = 3; + } + + if (var25 == 1) { + var19 = 4; + } + + if (var25 == 2) { + var19 = 5; + } + + if (var25 == 3) { + var19 = 6; + } + + if (var25 == 4) { + var19 = 1001; + } + + class1.insertMenuItemNoShift(var24[var25], NPC.colorStartTag(65535) + var16.name, var19, var15, var12, var13); + } + } + } + + class1.insertMenuItemNoShift("Examine", NPC.colorStartTag(65535) + var16.name, 1002, var16.id, var12, var13); + } + } + + int var17; + NPC var18; + Player var20; + int[] var31; + int var33; + if (var14 == 1) { + NPC var28 = Client.npcs[var15]; + if (var28 == null) { + continue; + } + + if (var28.definition.size == 1 && (var28.x & 127) == 64 && (var28.y & 127) == 64) { + for (var17 = 0; var17 < Client.npcCount; ++var17) { + var18 = Client.npcs[Client.npcIndices[var17]]; + if (var18 != null && var18 != var28 && var18.definition.size == 1 && var18.x == var28.x && var28.y == var18.y) { + DefaultsGroup.addNpcToMenu(var18.definition, Client.npcIndices[var17], var12, var13); + } + } + + var17 = Players.Players_count; + var31 = Players.Players_indices; + + for (var33 = 0; var33 < var17; ++var33) { + var20 = Client.players[var31[var33]]; + if (var20 != null && var28.x == var20.x && var20.y == var28.y) { + class30.addPlayerToMenu(var20, var31[var33], var12, var13); + } + } + } + + DefaultsGroup.addNpcToMenu(var28.definition, var15, var12, var13); + } + + if (var14 == 0) { + Player var29 = Client.players[var15]; + if (var29 == null) { + continue; + } + + if ((var29.x & 127) == 64 && (var29.y & 127) == 64) { + for (var17 = 0; var17 < Client.npcCount; ++var17) { + var18 = Client.npcs[Client.npcIndices[var17]]; + if (var18 != null && var18.definition.size == 1 && var29.x == var18.x && var18.y == var29.y) { + DefaultsGroup.addNpcToMenu(var18.definition, Client.npcIndices[var17], var12, var13); + } + } + + var17 = Players.Players_count; + var31 = Players.Players_indices; + + for (var33 = 0; var33 < var17; ++var33) { + var20 = Client.players[var31[var33]]; + if (var20 != null && var20 != var29 && var20.x == var29.x && var20.y == var29.y) { + class30.addPlayerToMenu(var20, var31[var33], var12, var13); + } + } + } + + if (var15 != Client.combatTargetPlayerIndex) { + class30.addPlayerToMenu(var29, var15, var12, var13); + } else { + var4 = var9; + } + } + + if (var14 == 3) { + NodeDeque var30 = Client.groundItems[UrlRequest.Client_plane][var12][var13]; + if (var30 != null) { + for (TileItem var34 = (TileItem)var30.first(); var34 != null; var34 = (TileItem)var30.next()) { + ItemDefinition var32 = PacketBufferNode.ItemDefinition_get(var34.id); + if (Client.isItemSelected == 1) { + class1.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + NPC.colorStartTag(16748608) + var32.name, 16, var34.id, var12, var13); + } else if (Client.isSpellSelected) { + if ((ReflectionCheck.selectedSpellFlags & 1) == 1) { + class1.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + NPC.colorStartTag(16748608) + var32.name, 17, var34.id, var12, var13); + } + } else { + String[] var26 = var32.groundActions; + + for (int var27 = 4; var27 >= 0; --var27) { + if (var26 != null && var26[var27] != null) { + byte var21 = 0; + if (var27 == 0) { + var21 = 18; + } + + if (var27 == 1) { + var21 = 19; + } + + if (var27 == 2) { + var21 = 20; + } + + if (var27 == 3) { + var21 = 21; + } + + if (var27 == 4) { + var21 = 22; + } + + class1.insertMenuItemNoShift(var26[var27], NPC.colorStartTag(16748608) + var32.name, var21, var34.id, var12, var13); + } else if (var27 == 2) { + class1.insertMenuItemNoShift("Take", NPC.colorStartTag(16748608) + var32.name, 20, var34.id, var12, var13); + } + } + + class1.insertMenuItemNoShift("Examine", NPC.colorStartTag(16748608) + var32.name, 1004, var34.id, var12, var13); + } + } + } + } } } - int var22 = (int)(var6 * 256.0D); - int var13 = (int)(256.0D * var8); - int var23 = (int)(256.0D * var10); - int var15 = var23 + (var13 << 8) + (var22 << 16); - return var15; + if (-1L != var4) { + var8 = class288.method5334(var4); + int var22 = (int)(var4 >>> 7 & 127L); + Player var11 = Client.players[Client.combatTargetPlayerIndex]; + class30.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var22); + } + } } diff --git a/runescape-client/src/main/java/IgnoreList.java b/runescape-client/src/main/java/IgnoreList.java index e804b4429a..ff3d540870 100644 --- a/runescape-client/src/main/java/IgnoreList.java +++ b/runescape-client/src/main/java/IgnoreList.java @@ -1,50 +1,62 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ju") @Implements("IgnoreList") public class IgnoreList extends UserList { - @ObfuscatedName("b") + @ObfuscatedName("ac") @ObfuscatedSignature( - signature = "Llg;" + signature = "Llk;" + ) + @Export("rasterProvider") + public static AbstractRasterProvider rasterProvider; + @ObfuscatedName("af") + @ObfuscatedGetter( + intValue = 171916373 + ) + static int field3579; + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "Lll;" ) @Export("loginType") final LoginType loginType; @ObfuscatedSignature( - signature = "(Llg;)V" + signature = "(Lll;)V" ) public IgnoreList(LoginType var1) { super(400); this.loginType = var1; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(I)Ljr;", - garbageValue = "-1592540968" + signature = "(B)Ljy;", + garbageValue = "68" ) @Export("newInstance") User newInstance() { return new Ignored(); } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IB)[Ljr;", - garbageValue = "-122" + signature = "(IB)[Ljy;", + garbageValue = "32" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new Ignored[var1]; } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Lkg;II)V", - garbageValue = "931957014" + signature = "(Lkq;II)V", + garbageValue = "1755489735" ) @Export("read") public void read(Buffer var1, int var2) { @@ -59,7 +71,7 @@ public class IgnoreList extends UserList { Ignored var7 = (Ignored)this.getByCurrentUsername(var5); if (var4) { Ignored var8 = (Ignored)this.getByCurrentUsername(var6); - if (var8 != null && var7 != var8) { + if (var8 != null && var8 != var7) { if (var7 != null) { this.remove(var8); } else { diff --git a/runescape-client/src/main/java/Ignored.java b/runescape-client/src/main/java/Ignored.java index fa3707083b..96aaa652e9 100644 --- a/runescape-client/src/main/java/Ignored.java +++ b/runescape-client/src/main/java/Ignored.java @@ -4,14 +4,17 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ji") +@ObfuscatedName("je") @Implements("Ignored") public class Ignored extends User { - @ObfuscatedName("a") - public static String[] field3610; - @ObfuscatedName("u") + @ObfuscatedName("rq") @ObfuscatedGetter( - intValue = -2146797941 + intValue = 220663936 + ) + static int field3589; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 53560497 ) @Export("id") int id; @@ -19,20 +22,20 @@ public class Ignored extends User { Ignored() { } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Lji;I)I", - garbageValue = "-463772537" + signature = "(Lje;I)I", + garbageValue = "1201655164" ) @Export("compareTo_ignored") int compareTo_ignored(Ignored var1) { return this.id - var1.id; } - @ObfuscatedName("v") + @ObfuscatedName("ay") @ObfuscatedSignature( - signature = "(Ljr;B)I", - garbageValue = "41" + signature = "(Ljy;S)I", + garbageValue = "9221" ) @Export("compareTo_user") public int compareTo_user(User var1) { diff --git a/runescape-client/src/main/java/IndexedSprite.java b/runescape-client/src/main/java/IndexedSprite.java index c2a9dd212b..7e59e40c33 100644 --- a/runescape-client/src/main/java/IndexedSprite.java +++ b/runescape-client/src/main/java/IndexedSprite.java @@ -2,38 +2,35 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("lm") +@ObfuscatedName("li") @Implements("IndexedSprite") public final class IndexedSprite extends Rasterizer2D { - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("pixels") public byte[] pixels; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("palette") public int[] palette; - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("subWidth") public int subWidth; - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("subHeight") public int subHeight; - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("xOffset") public int xOffset; - @ObfuscatedName("p") + @ObfuscatedName("b") @Export("yOffset") public int yOffset; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("width") public int width; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("height") public int height; - IndexedSprite() { - } - - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("normalize") public void normalize() { if (this.subWidth != this.width || this.subHeight != this.height) { @@ -54,7 +51,7 @@ public final class IndexedSprite extends Rasterizer2D { } } - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("shiftColors") public void shiftColors(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.palette.length; ++var4) { @@ -87,7 +84,7 @@ public final class IndexedSprite extends Rasterizer2D { } - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("drawAt") public void drawAt(int var1, int var2) { var1 += this.xOffset; @@ -133,8 +130,8 @@ public final class IndexedSprite extends Rasterizer2D { } } - @ObfuscatedName("z") - public void method6182(int var1, int var2, int var3, int var4) { + @ObfuscatedName("p") + public void method6124(int var1, int var2, int var3, int var4) { int var5 = this.subWidth; int var6 = this.subHeight; int var7 = 0; @@ -195,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("g") + @ObfuscatedName("w") @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); @@ -249,7 +246,7 @@ public final class IndexedSprite extends Rasterizer2D { } - @ObfuscatedName("p") + @ObfuscatedName("b") @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 5ef5007f04..eef18aba3f 100644 --- a/runescape-client/src/main/java/Instrument.java +++ b/runescape-client/src/main/java/Instrument.java @@ -4,112 +4,112 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dr") +@ObfuscatedName("dp") @Implements("Instrument") public class Instrument { - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("Instrument_samples") static int[] Instrument_samples; - @ObfuscatedName("d") + @ObfuscatedName("n") @Export("Instrument_noise") static int[] Instrument_noise; - @ObfuscatedName("s") + @ObfuscatedName("u") @Export("Instrument_sine") static int[] Instrument_sine; - @ObfuscatedName("m") + @ObfuscatedName("h") @Export("Instrument_phases") static int[] Instrument_phases; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("Instrument_delays") static int[] Instrument_delays; - @ObfuscatedName("q") + @ObfuscatedName("g") @Export("Instrument_volumeSteps") static int[] Instrument_volumeSteps; - @ObfuscatedName("l") + @ObfuscatedName("r") @Export("Instrument_pitchSteps") static int[] Instrument_pitchSteps; - @ObfuscatedName("j") + @ObfuscatedName("q") @Export("Instrument_pitchBaseSteps") static int[] Instrument_pitchBaseSteps; - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Ldx;" + signature = "Ldo;" ) @Export("pitch") SoundEnvelope pitch; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Ldx;" + signature = "Ldo;" ) @Export("volume") SoundEnvelope volume; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Ldx;" + signature = "Ldo;" ) @Export("pitchModifier") SoundEnvelope pitchModifier; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Ldx;" + signature = "Ldo;" ) @Export("pitchModifierAmplitude") SoundEnvelope pitchModifierAmplitude; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Ldx;" + signature = "Ldo;" ) @Export("volumeMultiplier") SoundEnvelope volumeMultiplier; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "Ldx;" + signature = "Ldo;" ) @Export("volumeMultiplierAmplitude") SoundEnvelope volumeMultiplierAmplitude; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Ldx;" + signature = "Ldo;" ) @Export("release") SoundEnvelope release; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Ldx;" + signature = "Ldo;" ) @Export("attack") SoundEnvelope attack; - @ObfuscatedName("w") + @ObfuscatedName("a") @Export("oscillatorVolume") int[] oscillatorVolume; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("oscillatorPitch") int[] oscillatorPitch; - @ObfuscatedName("k") + @ObfuscatedName("c") @Export("oscillatorDelays") int[] oscillatorDelays; - @ObfuscatedName("x") + @ObfuscatedName("o") @Export("delayTime") int delayTime; - @ObfuscatedName("o") + @ObfuscatedName("v") @Export("delayDecay") int delayDecay; - @ObfuscatedName("e") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "Ldh;" ) @Export("filter") AudioFilter filter; - @ObfuscatedName("n") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Ldx;" + signature = "Ldo;" ) @Export("filterEnvelope") SoundEnvelope filterEnvelope; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("duration") int duration; - @ObfuscatedName("c") + @ObfuscatedName("t") @Export("offset") int offset; @@ -146,7 +146,7 @@ public class Instrument { this.offset = 0; } - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("synthesize") final int[] synthesize(int var1, int var2) { class300.clearIntArray(Instrument_samples, 0, var1); @@ -353,7 +353,7 @@ public class Instrument { } } - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("evaluateWave") final int evaluateWave(int var1, int var2, int var3) { if (var3 == 1) { @@ -367,9 +367,9 @@ public class Instrument { } } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Lkg;)V" + signature = "(Lkq;)V" ) @Export("decode") final void decode(Buffer var1) { @@ -421,6 +421,6 @@ public class Instrument { this.offset = var1.readUnsignedShort(); this.filter = new AudioFilter(); this.filterEnvelope = new SoundEnvelope(); - this.filter.method2729(var1, this.filterEnvelope); + this.filter.method2713(var1, this.filterEnvelope); } } diff --git a/runescape-client/src/main/java/IntHashTable.java b/runescape-client/src/main/java/IntHashTable.java index eb2721587f..5835c15279 100644 --- a/runescape-client/src/main/java/IntHashTable.java +++ b/runescape-client/src/main/java/IntHashTable.java @@ -3,10 +3,12 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("la") +@ObfuscatedName("lq") @Implements("IntHashTable") public class IntHashTable { - @ObfuscatedName("u") + @ObfuscatedName("a") + public static short[] field4010; + @ObfuscatedName("f") @Export("array") int[] array; @@ -32,10 +34,10 @@ public class IntHashTable { } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "(II)I", - garbageValue = "1209776810" + garbageValue = "409094237" ) @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 84dea09b46..cbdd8190ce 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("ft") +@ObfuscatedName("gx") @Implements("IntegerNode") public class IntegerNode extends Node { - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("integer") public int integer; diff --git a/runescape-client/src/main/java/InterfaceParent.java b/runescape-client/src/main/java/InterfaceParent.java index e9a910693a..3414c28be1 100644 --- a/runescape-client/src/main/java/InterfaceParent.java +++ b/runescape-client/src/main/java/InterfaceParent.java @@ -1,92 +1,51 @@ -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("bf") +@ObfuscatedName("bz") @Implements("InterfaceParent") public class InterfaceParent extends Node { - @ObfuscatedName("pe") - @ObfuscatedSignature( - signature = "Ljg;" - ) - @Export("clanChat") - static ClanChat clanChat; - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Llm;" - ) - @Export("options_buttons_0Sprite") - static IndexedSprite options_buttons_0Sprite; - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -827675327 + intValue = 1533834755 ) @Export("group") int group; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -207646309 + intValue = 642122867 ) @Export("type") int type; - @ObfuscatedName("b") - boolean field561; + @ObfuscatedName("y") + boolean field546; InterfaceParent() { - this.field561 = false; + this.field546 = false; } - @ObfuscatedName("fr") + @ObfuscatedName("fs") @ObfuscatedSignature( - signature = "(Liy;IIIB)V", - garbageValue = "-6" + signature = "(I)V", + garbageValue = "472182360" ) - @Export("addSequenceSoundEffect") - static void addSequenceSoundEffect(SequenceDefinition var0, int var1, int var2, int var3) { - if (Client.soundEffectCount < 50 && Client.areaSoundEffectVolume != 0) { - if (var0.soundEffects != null && var1 < var0.soundEffects.length) { - int var4 = var0.soundEffects[var1]; - if (var4 != 0) { - int var5 = var4 >> 8; - int var6 = var4 >> 4 & 7; - int var7 = var4 & 15; - Client.soundEffectIds[Client.soundEffectCount] = var5; - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6; - Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; - Client.soundEffects[Client.soundEffectCount] = null; - int var8 = (var2 - 64) / 128; - int var9 = (var3 - 64) / 128; - Client.soundLocations[Client.soundEffectCount] = var7 + (var9 << 8) + (var8 << 16); - ++Client.soundEffectCount; - } - } + @Export("logOut") + static final void logOut() { + Client.packetWriter.close(); + class81.method2063(); + class14.scene.clear(); + + for (int var0 = 0; var0 < 4; ++var0) { + Client.collisionMaps[var0].clear(); } - } - @ObfuscatedName("hn") - @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "1179821355" - ) - static final void method1197(boolean var0) { - Tiles.playPcmPlayers(); - ++Client.packetWriter.pendingWrites; - if (Client.packetWriter.pendingWrites >= 50 || var0) { - Client.packetWriter.pendingWrites = 0; - if (!Client.field691 && Client.packetWriter.getSocket() != null) { - PacketBufferNode var1 = ModelData0.getPacketBufferNode(ClientPacket.field2278, Client.packetWriter.isaacCipher); - Client.packetWriter.addNode(var1); - - try { - Client.packetWriter.flush(); - } catch (IOException var3) { - Client.field691 = true; - } - } - - } + System.gc(); + BoundaryObject.method3273(2); + Client.currentTrackGroupId = -1; + Client.field767 = false; + WorldMapSectionType.method236(); + class195.updateGameState(10); } } diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java index 417e956df2..18167641f1 100644 --- a/runescape-client/src/main/java/Interpreter.java +++ b/runescape-client/src/main/java/Interpreter.java @@ -1,77 +1,69 @@ +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; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bh") +@ObfuscatedName("bt") @Implements("Interpreter") public class Interpreter { - @ObfuscatedName("ps") + @ObfuscatedName("sn") @ObfuscatedSignature( - signature = "Lln;" + signature = "Lbf;" ) - @Export("sceneMinimapSprite") - static Sprite sceneMinimapSprite; - @ObfuscatedName("z") + @Export("clientPreferences") + static ClientPreferences clientPreferences; + @ObfuscatedName("y") + @Export("Interpreter_intLocals") + static int[] Interpreter_intLocals; + @ObfuscatedName("p") @Export("Interpreter_arrayLengths") static int[] Interpreter_arrayLengths; - @ObfuscatedName("p") + @ObfuscatedName("b") @Export("Interpreter_arrays") static int[][] Interpreter_arrays; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("Interpreter_intStack") static int[] Interpreter_intStack; - @ObfuscatedName("w") + @ObfuscatedName("x") + @Export("ByteArrayPool_altSizeArrayCounts") + static int[] ByteArrayPool_altSizeArrayCounts; + @ObfuscatedName("a") @Export("Interpreter_stringStack") static String[] Interpreter_stringStack; - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1012398359 + intValue = -1511874989 ) @Export("Interpreter_frameDepth") static int Interpreter_frameDepth; - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "[Lbd;" + signature = "[Lbk;" ) @Export("Interpreter_frames") static ScriptFrame[] Interpreter_frames; - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "Lcf;" - ) - @Export("pcmPlayerProvider") - static class99 pcmPlayerProvider; - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lhl;" - ) - static Widget field1090; - @ObfuscatedName("n") + @ObfuscatedName("s") @Export("Interpreter_calendar") static java.util.Calendar Interpreter_calendar; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("Interpreter_MONTHS") static final String[] Interpreter_MONTHS; - @ObfuscatedName("a") - static boolean field1093; - @ObfuscatedName("d") - static boolean field1087; - @ObfuscatedName("s") + @ObfuscatedName("j") + static boolean field1077; + @ObfuscatedName("n") + static boolean field1078; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -185993069 + intValue = -1660358445 ) - static int field1095; - @ObfuscatedName("q") - static final double field1082; - @ObfuscatedName("dk") - @ObfuscatedSignature( - signature = "Lkn;" - ) - @Export("js5Socket") - static AbstractSocket js5Socket; + static int field1079; + @ObfuscatedName("g") + static final double field1083; + @ObfuscatedName("at") + @Export("garbageCollector") + static GarbageCollectorMXBean garbageCollector; static { Interpreter_arrayLengths = new int[5]; @@ -82,174 +74,141 @@ 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"}; - field1093 = false; - field1087 = false; - field1095 = 0; - field1082 = Math.log(2.0D); + field1077 = false; + field1078 = false; + field1079 = 0; + field1083 = Math.log(2.0D); } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(II)Liu;", - garbageValue = "-1932320530" + signature = "(CLgs;I)C", + garbageValue = "813318592" ) - @Export("ItemDefinition_get") - public static ItemDefinition ItemDefinition_get(int var0) { - ItemDefinition var1 = (ItemDefinition)ItemDefinition.ItemDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; + @Export("standardizeChar") + static char standardizeChar(char var0, Language var1) { + if (var0 >= 192 && var0 <= 255) { + if (var0 >= 192 && var0 <= 198) { + return 'A'; + } + + if (var0 == 199) { + return 'C'; + } + + if (var0 >= 200 && var0 <= 203) { + return 'E'; + } + + if (var0 >= 204 && var0 <= 207) { + return 'I'; + } + + if (var0 == 209 && var1 != Language.Language_ES) { + return 'N'; + } + + if (var0 >= 210 && var0 <= 214) { + return 'O'; + } + + if (var0 >= 217 && var0 <= 220) { + return 'U'; + } + + if (var0 == 221) { + return 'Y'; + } + + if (var0 == 223) { + return 's'; + } + + if (var0 >= 224 && var0 <= 230) { + return 'a'; + } + + if (var0 == 231) { + return 'c'; + } + + if (var0 >= 232 && var0 <= 235) { + return 'e'; + } + + if (var0 >= 236 && var0 <= 239) { + return 'i'; + } + + if (var0 == 241 && var1 != Language.Language_ES) { + return 'n'; + } + + if (var0 >= 242 && var0 <= 246) { + return 'o'; + } + + if (var0 >= 249 && var0 <= 252) { + return 'u'; + } + + if (var0 == 253 || var0 == 255) { + return 'y'; + } + } + + if (var0 == 338) { + return 'O'; + } else if (var0 == 339) { + return 'o'; + } else if (var0 == 376) { + return 'Y'; } else { - byte[] var2 = ItemDefinition.ItemDefinition_archive.takeFile(10, var0); - var1 = new ItemDefinition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.post(); - if (var1.noteTemplate != -1) { - var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note)); - } - - if (var1.notedId != -1) { - var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId)); - } - - if (var1.placeholderTemplate != -1) { - var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder)); - } - - if (!ItemDefinition.ItemDefinition_inMembersWorld && var1.isMembersOnly) { - var1.name = "Members object"; - var1.isTradable = false; - var1.groundActions = null; - var1.inventoryActions = null; - var1.shiftClickIndex = -1; - var1.team = 0; - if (var1.params != null) { - boolean var3 = false; - - for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { - ParamDefinition var5 = MusicPatchNode.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; + return var0; } } - @ObfuscatedName("f") + @ObfuscatedName("fl") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;I)Z", - garbageValue = "-1540204759" + signature = "(I)V", + garbageValue = "-2098747776" ) - @Export("isNumber") - public static boolean isNumber(CharSequence var0) { - return SpriteMask.method4039(var0, 10, true); - } + static void method2020() { + Client.packetWriter.clearBuffer(); + Client.packetWriter.packetBuffer.offset = 0; + Client.packetWriter.serverPacket = null; + Client.packetWriter.field1300 = null; + Client.packetWriter.field1301 = null; + Client.packetWriter.field1299 = null; + Client.packetWriter.serverPacketLength = 0; + Client.packetWriter.field1298 = 0; + Client.rebootTimer = 0; + WorldMapData_1.method708(); + Client.minimapState = 0; + Client.destinationX = 0; - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "(ILci;ZI)I", - garbageValue = "1948301704" - ) - static int method1995(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var3 = Language.getWidget(Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]); - } else { - var3 = var2 ? field1090 : class188.field2352; + int var0; + for (var0 = 0; var0 < 2048; ++var0) { + Client.players[var0] = null; } - ScriptEvent.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_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { - var3.modelType = 3; - var3.modelId = class215.localPlayer.appearance.getChatHeadId(); - return 1; - } else { - return 2; - } - } else { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - int var4 = Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - int var5 = Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - var3.itemId = var4; - var3.itemQuantity = var5; - ItemDefinition var6 = 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; - } + Message.localPlayer = null; - if (var3.field2711 > 0) { - var3.modelZoom = var3.modelZoom * 32 / var3.field2711; - } else if (var3.rawWidth > 0) { - var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; - } - - return 1; - } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "(Ldf;IIIB)Z", - garbageValue = "-22" - ) - static final boolean method1969(Model var0, int var1, int var2, int var3) { - boolean var4 = ViewportMouse.ViewportMouse_isInViewport; - if (!var4) { - return false; - } else { - class96.method2307(); - int var5 = var0.xMid + var1; - int var6 = var2 + var0.yMid; - int var7 = var3 + var0.zMid; - int var8 = var0.xMidOffset; - int var9 = var0.yMidOffset; - int var10 = var0.zMidOffset; - int var11 = class30.field261 - var5; - int var12 = class2.field5 - var6; - int var13 = GrandExchangeEvents.field36 - var7; - if (Math.abs(var11) > var8 + Frames.field1880) { - return false; - } else if (Math.abs(var12) > var9 + class189.field2355) { - return false; - } else if (Math.abs(var13) > var10 + class65.field603) { - return false; - } else if (Math.abs(var13 * ViewportMouse.field1739 - var12 * class288.field3652) > var9 * class65.field603 + var10 * class189.field2355) { - return false; - } else if (Math.abs(var11 * class288.field3652 - var13 * ViewportMouse.field1737) > var8 * class65.field603 + var10 * Frames.field1880) { - return false; - } else { - return Math.abs(var12 * ViewportMouse.field1737 - var11 * ViewportMouse.field1739) <= var9 * Frames.field1880 + var8 * class189.field2355; + for (var0 = 0; var0 < Client.npcs.length; ++var0) { + NPC var1 = Client.npcs[var0]; + if (var1 != null) { + var1.targetIndex = -1; + var1.false0 = false; } } + + ItemContainer.itemContainers = new NodeHashTable(32); + class195.updateGameState(30); + + for (var0 = 0; var0 < 100; ++var0) { + Client.field833[var0] = true; + } + + class219.method4076(); } } diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java index 23e409bf53..b27f369006 100644 --- a/runescape-client/src/main/java/InvDefinition.java +++ b/runescape-client/src/main/java/InvDefinition.java @@ -4,35 +4,24 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("it") +@ObfuscatedName("ip") @Implements("InvDefinition") public class InvDefinition extends DualNode { - @ObfuscatedName("sy") - @ObfuscatedSignature( - signature = "Lif;" - ) - public static class237 field3210; - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lhf;" - ) - @Export("InvDefinition_archive") - public static AbstractArchive InvDefinition_archive; @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lef;" + signature = "Lhz;" + ) + @Export("InvDefinition_archive") + static AbstractArchive InvDefinition_archive; + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "Leb;" ) @Export("InvDefinition_cached") static EvictingDualNodeHashTable InvDefinition_cached; - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lhf;" - ) - @Export("Widget_archive") - public static AbstractArchive Widget_archive; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1331007469 + intValue = -2110300501 ) @Export("size") public int size; @@ -45,10 +34,10 @@ public class InvDefinition extends DualNode { this.size = 0; } - @ObfuscatedName("f") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Lkg;B)V", - garbageValue = "-67" + signature = "(Lkq;I)V", + garbageValue = "-1721962305" ) @Export("decode") void decode(Buffer var1) { @@ -62,10 +51,10 @@ public class InvDefinition extends DualNode { } } - @ObfuscatedName("b") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lkg;II)V", - garbageValue = "63686644" + signature = "(Lkq;II)V", + garbageValue = "-1369640921" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -75,22 +64,29 @@ public class InvDefinition extends DualNode { } - @ObfuscatedName("z") + @ObfuscatedName("ks") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "-77" + signature = "(IIIILls;Lhy;B)V", + garbageValue = "-108" ) - @Export("isKeyDown") - public static final boolean isKeyDown() { - synchronized(KeyHandler.KeyHandler_instance) { - if (KeyHandler.field399 == KeyHandler.field384) { - return false; - } else { - class49.field418 = KeyHandler.field396[KeyHandler.field399]; - class297.field3699 = KeyHandler.field395[KeyHandler.field399]; - KeyHandler.field399 = KeyHandler.field399 + 1 & 127; - return true; - } + @Export("worldToMinimap") + static final void worldToMinimap(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) { + int var6 = var3 * var3 + var2 * var2; + if (var6 > 4225 && var6 < 90000) { + int var7 = Client.camAngleY & 2047; + int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; + int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; + int var10 = var3 * var8 + var9 * var2 >> 16; + int var11 = var3 * var9 - var8 * var2 >> 16; + double var12 = Math.atan2((double)var10, (double)var11); + int var14 = var5.width / 2 - 25; + int var15 = (int)(Math.sin(var12) * (double)var14); + int var16 = (int)(Math.cos(var12) * (double)var14); + byte var17 = 20; + class40.redHintArrowSprite.method6167(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); + } else { + GrandExchangeOfferNameComparator.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); } + } } diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java index 44c218983e..607de9db52 100644 --- a/runescape-client/src/main/java/IsaacCipher.java +++ b/runescape-client/src/main/java/IsaacCipher.java @@ -4,36 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ld") +@ObfuscatedName("lr") @Implements("IsaacCipher") public final class IsaacCipher { - @ObfuscatedName("g") + @ObfuscatedName("iz") @ObfuscatedGetter( - intValue = -1571057455 + intValue = -1001005683 + ) + @Export("selectedItemId") + static int selectedItemId; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = 1472427877 ) @Export("valuesRemaining") int valuesRemaining; - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("results") int[] results; - @ObfuscatedName("p") + @ObfuscatedName("b") @Export("mm") int[] mm; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1397727627 + intValue = 342610409 ) @Export("aa") int aa; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1547439877 + intValue = -1405069549 ) @Export("bb") int bb; - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1834697375 + intValue = 1673829147 ) @Export("cc") int cc; @@ -46,13 +52,13 @@ public final class IsaacCipher { this.results[var2] = var1[var2]; } - this.method6332(); + this.method6307(); } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-1791712529" + signature = "(B)I", + garbageValue = "-111" ) @Export("nextInt") public final int nextInt() { @@ -64,12 +70,12 @@ public final class IsaacCipher { return this.results[--this.valuesRemaining]; } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1109117945" + garbageValue = "-1728742409" ) - public final int method6331() { + public final int method6305() { if (this.valuesRemaining == 0) { this.generateMoreResults(); this.valuesRemaining = 256; @@ -78,10 +84,10 @@ public final class IsaacCipher { return this.results[this.valuesRemaining - 1]; } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1602632803" + signature = "(B)V", + garbageValue = "-60" ) @Export("generateMoreResults") final void generateMoreResults() { @@ -101,7 +107,7 @@ 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.bb + this.aa; this.results[var1] = this.bb = this.mm[(var3 >> 8 & 1020) >> 2] + var2; @@ -109,12 +115,12 @@ public final class IsaacCipher { } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-660697769" + garbageValue = "756706735" ) - final void method6332() { + final void method6307() { int var9 = -1640531527; int var8 = -1640531527; int var7 = -1640531527; diff --git a/runescape-client/src/main/java/ItemContainer.java b/runescape-client/src/main/java/ItemContainer.java index 2aa67f0eb2..816b01e56e 100644 --- a/runescape-client/src/main/java/ItemContainer.java +++ b/runescape-client/src/main/java/ItemContainer.java @@ -4,37 +4,24 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bm") +@ObfuscatedName("bc") @Implements("ItemContainer") public class ItemContainer extends Node { - @ObfuscatedName("oc") - @ObfuscatedSignature( - signature = "Lfk;" - ) - @Export("mouseWheel") - static MouseWheel mouseWheel; - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lle;" ) @Export("itemContainers") static NodeHashTable itemContainers; - @ObfuscatedName("bq") - @ObfuscatedSignature( - signature = "[Llm;" - ) - @Export("worldSelectFlagSprites") - static IndexedSprite[] worldSelectFlagSprites; - @ObfuscatedName("hs") + @ObfuscatedName("dg") @ObfuscatedGetter( - intValue = 778957861 + longValue = 151185411405630583L ) - @Export("cameraPitch") - static int cameraPitch; - @ObfuscatedName("f") + static long field519; + @ObfuscatedName("i") @Export("ids") int[] ids; - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("quantities") int[] quantities; @@ -47,19 +34,15 @@ public class ItemContainer extends Node { this.quantities = new int[]{0}; } - @ObfuscatedName("h") - @Export("Entity_unpackID") - public static int Entity_unpackID(long var0) { - return (int)(var0 >>> 17 & 4294967295L); - } - - @ObfuscatedName("gp") + @ObfuscatedName("jf") @ObfuscatedSignature( - signature = "(Lbt;II)V", - garbageValue = "1416714498" + signature = "(IIB)V", + garbageValue = "-83" ) - @Export("getActorScreenLocation") - static final void getActorScreenLocation(Actor var0, int var1) { - TextureProvider.worldToScreen(var0.x, var0.y, var1); + @Export("runIntfCloseListeners") + static final void runIntfCloseListeners(int var0, int var1) { + if (MusicPatch.loadInterface(var0)) { + DynamicObject.runComponentCloseListeners(UserComparator7.Widget_interfaceComponents[var0], var1); + } } } diff --git a/runescape-client/src/main/java/ItemDefinition.java b/runescape-client/src/main/java/ItemDefinition.java index 26f876ca13..1184a3a8b5 100644 --- a/runescape-client/src/main/java/ItemDefinition.java +++ b/runescape-client/src/main/java/ItemDefinition.java @@ -4,282 +4,294 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iu") +@ObfuscatedName("ii") @Implements("ItemDefinition") public class ItemDefinition extends DualNode { - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lhf;" + signature = "Lhz;" ) - @Export("ItemDefinition_archive") - static AbstractArchive ItemDefinition_archive; - @ObfuscatedName("y") + @Export("ItemDefinition_modelArchive") + static AbstractArchive ItemDefinition_modelArchive; + @ObfuscatedName("x") @Export("ItemDefinition_inMembersWorld") static boolean ItemDefinition_inMembersWorld; - @ObfuscatedName("i") + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 1592128497 + ) + @Export("ItemDefinition_fileCount") + public static int ItemDefinition_fileCount; + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lef;" + signature = "Leb;" ) @Export("ItemDefinition_cached") static EvictingDualNodeHashTable ItemDefinition_cached; - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lef;" + signature = "Leb;" ) @Export("ItemDefinition_cachedModels") static EvictingDualNodeHashTable ItemDefinition_cachedModels; - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lef;" + signature = "Leb;" ) @Export("ItemDefinition_cachedSprites") static EvictingDualNodeHashTable ItemDefinition_cachedSprites; - @ObfuscatedName("e") + @ObfuscatedName("dl") + @ObfuscatedSignature( + signature = "Lif;" + ) + @Export("archive1") + static Archive archive1; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1707758529 + intValue = 1070204959 ) @Export("id") public int id; - @ObfuscatedName("n") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1053221347 + intValue = -693135883 ) @Export("model") int model; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("name") public String name; - @ObfuscatedName("c") + @ObfuscatedName("t") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("d") + @ObfuscatedName("n") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("s") + @ObfuscatedName("u") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -2055958697 + intValue = 785772529 ) @Export("zoom2d") public int zoom2d; - @ObfuscatedName("m") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1816614305 + intValue = -848519743 ) @Export("xan2d") public int xan2d; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1526001809 + intValue = -1979835091 ) @Export("yan2d") public int yan2d; - @ObfuscatedName("q") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -539889481 + intValue = 130944553 ) @Export("zan2d") public int zan2d; - @ObfuscatedName("l") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 322028541 + intValue = -977084785 ) @Export("offsetX2d") public int offsetX2d; - @ObfuscatedName("j") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -2088965279 + intValue = -631330381 ) @Export("offsetY2d") public int offsetY2d; - @ObfuscatedName("af") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -1815571439 + intValue = 440066331 ) @Export("isStackable") public int isStackable; - @ObfuscatedName("ad") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -552662655 + intValue = -186300413 ) @Export("price") public int price; - @ObfuscatedName("am") + @ObfuscatedName("aw") @Export("isMembersOnly") public boolean isMembersOnly; - @ObfuscatedName("ai") + @ObfuscatedName("as") @Export("groundActions") public String[] groundActions; - @ObfuscatedName("ag") + @ObfuscatedName("ak") @Export("inventoryActions") public String[] inventoryActions; - @ObfuscatedName("aw") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = -1971378651 + intValue = -1938570583 ) @Export("shiftClickIndex") int shiftClickIndex; - @ObfuscatedName("ak") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -1773729327 + intValue = -1452164645 ) @Export("maleModel") int maleModel; - @ObfuscatedName("aa") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -455750453 + intValue = 195242013 ) @Export("maleModel1") int maleModel1; - @ObfuscatedName("ab") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -1417938545 + intValue = 1805803195 ) @Export("maleOffset") int maleOffset; @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -1824818731 + intValue = -992390513 ) @Export("femaleModel") int femaleModel; - @ObfuscatedName("av") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 1505112135 + intValue = -1602872537 ) @Export("femaleModel1") int femaleModel1; - @ObfuscatedName("aq") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = -1323922583 + intValue = 1432685421 ) @Export("femaleOffset") int femaleOffset; - @ObfuscatedName("ac") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -601368135 + intValue = -567109747 ) @Export("maleModel2") int maleModel2; - @ObfuscatedName("az") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = 2064429329 + intValue = -1467762471 ) @Export("femaleModel2") int femaleModel2; - @ObfuscatedName("at") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -304223391 + intValue = 543483201 ) @Export("maleHeadModel") int maleHeadModel; @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -1381797739 + intValue = -93642959 ) @Export("maleHeadModel2") int maleHeadModel2; - @ObfuscatedName("aj") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -1901611229 + intValue = -685966397 ) @Export("femaleHeadModel") int femaleHeadModel; - @ObfuscatedName("ap") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 1400619091 + intValue = 1572395247 ) @Export("femaleHeadModel2") int femaleHeadModel2; - @ObfuscatedName("an") + @ObfuscatedName("ax") @Export("countobj") int[] countobj; - @ObfuscatedName("al") + @ObfuscatedName("at") @Export("countco") int[] countco; - @ObfuscatedName("ay") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 787629621 + intValue = -345365193 ) @Export("note") public int note; - @ObfuscatedName("ax") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 518109657 + intValue = -120980907 ) @Export("noteTemplate") public int noteTemplate; - @ObfuscatedName("au") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = 321486963 + intValue = 537794657 ) @Export("resizeX") int resizeX; - @ObfuscatedName("as") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = 1993733329 + intValue = 710858879 ) @Export("resizeY") int resizeY; - @ObfuscatedName("ah") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 129289269 + intValue = -1994951249 ) @Export("resizeZ") int resizeZ; - @ObfuscatedName("bi") + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = -577437457 + intValue = -740674709 ) @Export("ambient") public int ambient; - @ObfuscatedName("bo") + @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = 1778876649 + intValue = 1117780027 ) @Export("contrast") public int contrast; - @ObfuscatedName("bx") + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = -1174290321 + intValue = -1310493757 ) @Export("team") public int team; - @ObfuscatedName("bu") + @ObfuscatedName("bk") @ObfuscatedSignature( - signature = "Llb;" + signature = "Llc;" ) @Export("params") IterableNodeHashTable params; - @ObfuscatedName("bd") + @ObfuscatedName("bl") @Export("isTradable") public boolean isTradable; - @ObfuscatedName("bn") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = 867687465 + intValue = 1520856187 ) @Export("unnotedId") int unnotedId; - @ObfuscatedName("bj") + @ObfuscatedName("bx") @ObfuscatedGetter( - intValue = 16133681 + intValue = 480654725 ) @Export("notedId") int notedId; - @ObfuscatedName("bm") + @ObfuscatedName("bc") @ObfuscatedGetter( - intValue = -10172209 + intValue = 1889081019 ) @Export("placeholder") public int placeholder; - @ObfuscatedName("bq") + @ObfuscatedName("by") @ObfuscatedGetter( - intValue = 2111064913 + intValue = -50574295 ) @Export("placeholderTemplate") public int placeholderTemplate; @@ -331,19 +343,19 @@ public class ItemDefinition extends DualNode { this.placeholderTemplate = -1; } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1502929201" + signature = "(B)V", + garbageValue = "41" ) @Export("post") void post() { } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lkg;I)V", - garbageValue = "348104513" + signature = "(Lkq;I)V", + garbageValue = "874687185" ) @Export("decode") void decode(Buffer var1) { @@ -357,10 +369,10 @@ public class ItemDefinition extends DualNode { } } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Lkg;II)V", - garbageValue = "1444708655" + signature = "(Lkq;II)V", + garbageValue = "-1294049187" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -467,7 +479,7 @@ public class ItemDefinition extends DualNode { } else if (var2 == 113) { this.ambient = var1.readByte(); } else if (var2 == 114) { - this.contrast = var1.readByte() * 5; + this.contrast = var1.readByte(); } else if (var2 == 115) { this.team = var1.readUnsignedByte(); } else if (var2 == 139) { @@ -479,16 +491,16 @@ public class ItemDefinition extends DualNode { } else if (var2 == 149) { this.placeholderTemplate = var1.readUnsignedShort(); } else if (var2 == 249) { - this.params = ModelData0.readStringIntParameters(var1, this.params); + this.params = Calendar.readStringIntParameters(var1, this.params); } } } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(Liu;Liu;I)V", - garbageValue = "1697277685" + signature = "(Lii;Lii;I)V", + garbageValue = "-1450285007" ) @Export("genCert") void genCert(ItemDefinition var1, ItemDefinition var2) { @@ -509,10 +521,10 @@ public class ItemDefinition extends DualNode { this.isStackable = 1; } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Liu;Liu;S)V", - garbageValue = "23631" + signature = "(Lii;Lii;B)V", + garbageValue = "33" ) @Export("genBought") void genBought(ItemDefinition var1, ItemDefinition var2) { @@ -553,10 +565,10 @@ public class ItemDefinition extends DualNode { this.price = 0; } - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Liu;Liu;I)V", - garbageValue = "217032543" + signature = "(Lii;Lii;B)V", + garbageValue = "54" ) @Export("genPlaceholder") void genPlaceholder(ItemDefinition var1, ItemDefinition var2) { @@ -578,10 +590,10 @@ public class ItemDefinition extends DualNode { this.isTradable = false; } - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(II)Ldq;", - garbageValue = "1977010468" + signature = "(II)Ldd;", + garbageValue = "1663251439" ) @Export("getModelData") public final ModelData getModelData(int var1) { @@ -596,11 +608,11 @@ public class ItemDefinition extends DualNode { } if (var2 != -1) { - return Interpreter.ItemDefinition_get(var2).getModelData(1); + return PacketBufferNode.ItemDefinition_get(var2).getModelData(1); } } - ModelData var4 = ModelData.ModelData_get(class266.ItemDefinition_modelArchive, this.model, 0); + ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); if (var4 == null) { return null; } else { @@ -624,10 +636,10 @@ public class ItemDefinition extends DualNode { } } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(II)Ldf;", - garbageValue = "-438694006" + signature = "(II)Ldw;", + garbageValue = "1098912111" ) @Export("getModel") public final Model getModel(int var1) { @@ -641,7 +653,7 @@ public class ItemDefinition extends DualNode { } if (var2 != -1) { - return Interpreter.ItemDefinition_get(var2).getModel(1); + return PacketBufferNode.ItemDefinition_get(var2).getModel(1); } } @@ -649,7 +661,7 @@ public class ItemDefinition extends DualNode { if (var5 != null) { return var5; } else { - ModelData var6 = ModelData.ModelData_get(class266.ItemDefinition_modelArchive, this.model, 0); + ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); if (var6 == null) { return null; } else { @@ -670,7 +682,7 @@ public class ItemDefinition extends DualNode { } } - var5 = var6.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); + var5 = var6.toModel(this.ambient + 64, this.contrast * 5 + 768, -50, -10, -50); var5.isSingleTile = true; ItemDefinition_cachedModels.put(var5, (long)this.id); return var5; @@ -678,10 +690,10 @@ public class ItemDefinition extends DualNode { } } - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IB)Liu;", - garbageValue = "56" + signature = "(II)Lii;", + garbageValue = "-519915564" ) @Export("getCountObj") public ItemDefinition getCountObj(int var1) { @@ -695,17 +707,17 @@ public class ItemDefinition extends DualNode { } if (var2 != -1) { - return Interpreter.ItemDefinition_get(var2); + return PacketBufferNode.ItemDefinition_get(var2); } } return this; } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(ZI)Z", - garbageValue = "311572900" + garbageValue = "-90397002" ) @Export("hasNoValidModel") public final boolean hasNoValidModel(boolean var1) { @@ -722,15 +734,15 @@ public class ItemDefinition extends DualNode { return true; } else { boolean var5 = true; - if (!class266.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { + if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { var5 = false; } - if (var3 != -1 && !class266.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { + if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { var5 = false; } - if (var4 != -1 && !class266.ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { + if (var4 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { var5 = false; } @@ -738,12 +750,12 @@ public class ItemDefinition extends DualNode { } } - @ObfuscatedName("n") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(ZI)Ldq;", - garbageValue = "292190899" + signature = "(ZB)Ldd;", + garbageValue = "-26" ) - public final ModelData method4746(boolean var1) { + public final ModelData method4703(boolean var1) { int var2 = this.maleModel; int var3 = this.maleModel1; int var4 = this.maleModel2; @@ -756,11 +768,11 @@ public class ItemDefinition extends DualNode { if (var2 == -1) { return null; } else { - ModelData var5 = ModelData.ModelData_get(class266.ItemDefinition_modelArchive, var2, 0); + ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); if (var3 != -1) { - ModelData var6 = ModelData.ModelData_get(class266.ItemDefinition_modelArchive, var3, 0); + ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); if (var4 != -1) { - ModelData var7 = ModelData.ModelData_get(class266.ItemDefinition_modelArchive, var4, 0); + ModelData var7 = ModelData.ModelData_get(ItemDefinition_modelArchive, var4, 0); ModelData[] var8 = new ModelData[]{var5, var6, var7}; var5 = new ModelData(var8, 3); } else { @@ -794,12 +806,12 @@ public class ItemDefinition extends DualNode { } } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(ZI)Z", - garbageValue = "1230085198" + garbageValue = "517363999" ) - public final boolean method4754(boolean var1) { + public final boolean method4692(boolean var1) { int var2 = this.maleHeadModel; int var3 = this.maleHeadModel2; if (var1) { @@ -811,11 +823,11 @@ public class ItemDefinition extends DualNode { return true; } else { boolean var4 = true; - if (!class266.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { + if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { var4 = false; } - if (var3 != -1 && !class266.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { + if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { var4 = false; } @@ -823,12 +835,12 @@ public class ItemDefinition extends DualNode { } } - @ObfuscatedName("s") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(ZI)Ldq;", - garbageValue = "-1698197859" + signature = "(ZI)Ldd;", + garbageValue = "-451251342" ) - public final ModelData method4755(boolean var1) { + public final ModelData method4661(boolean var1) { int var2 = this.maleHeadModel; int var3 = this.maleHeadModel2; if (var1) { @@ -839,9 +851,9 @@ public class ItemDefinition extends DualNode { if (var2 == -1) { return null; } else { - ModelData var4 = ModelData.ModelData_get(class266.ItemDefinition_modelArchive, var2, 0); + ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); if (var3 != -1) { - ModelData var5 = ModelData.ModelData_get(class266.ItemDefinition_modelArchive, var3, 0); + ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); ModelData[] var6 = new ModelData[]{var4, var5}; var4 = new ModelData(var6, 2); } @@ -863,43 +875,30 @@ public class ItemDefinition extends DualNode { } } - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "1826497561" + signature = "(IIB)I", + garbageValue = "1" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - IterableNodeHashTable var4 = this.params; - int var3; - if (var4 == null) { - var3 = var2; - } else { - IntegerNode var5 = (IntegerNode)var4.get((long)var1); - if (var5 == null) { - var3 = var2; - } else { - var3 = var5.integer; - } - } + return class83.method2071(this.params, var1, var2); + } - return var3; + @ObfuscatedName("h") + @ObfuscatedSignature( + signature = "(ILjava/lang/String;I)Ljava/lang/String;", + garbageValue = "-513455254" + ) + @Export("getStringParam") + public String getStringParam(int var1, String var2) { + return class14.method151(this.params, var1, var2); } @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1305262203" - ) - @Export("getStringParam") - public String getStringParam(int var1, String var2) { - return ServerBuild.method4214(this.params, var1, var2); - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "83" + signature = "(I)I", + garbageValue = "1952337242" ) @Export("getShiftClickIndex") public int getShiftClickIndex() { @@ -913,4 +912,73 @@ public class ItemDefinition extends DualNode { return -1; } } + + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "-989883641" + ) + public static void method4715(int var0) { + if (var0 != -1) { + if (Widget.Widget_loadedInterfaces[var0]) { + FriendLoginUpdate.Widget_archive.clearFilesGroup(var0); + if (UserComparator7.Widget_interfaceComponents[var0] != null) { + boolean var1 = true; + + for (int var2 = 0; var2 < UserComparator7.Widget_interfaceComponents[var0].length; ++var2) { + if (UserComparator7.Widget_interfaceComponents[var0][var2] != null) { + if (UserComparator7.Widget_interfaceComponents[var0][var2].type != 2) { + UserComparator7.Widget_interfaceComponents[var0][var2] = null; + } else { + var1 = false; + } + } + } + + if (var1) { + UserComparator7.Widget_interfaceComponents[var0] = null; + } + + Widget.Widget_loadedInterfaces[var0] = false; + } + } + } + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "(ZB)V", + garbageValue = "30" + ) + @Export("Login_promptCredentials") + static void Login_promptCredentials(boolean var0) { + Login.Login_response1 = ""; + Login.Login_response2 = "Enter your username/email & password."; + Login.Login_response3 = ""; + Login.loginIndex = 2; + if (var0) { + Login.Login_password = ""; + } + + if (Login.Login_username == null || Login.Login_username.length() <= 0) { + if (Interpreter.clientPreferences.rememberedUsername != null) { + Login.Login_username = Interpreter.clientPreferences.rememberedUsername; + Client.Login_isUsernameRemembered = true; + } else { + Client.Login_isUsernameRemembered = false; + } + } + + WorldMapCacheName.method618(); + } + + @ObfuscatedName("gb") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "-1424977093" + ) + @Export("getWindowedMode") + static int getWindowedMode() { + return Client.isResizable ? 2 : 1; + } } diff --git a/runescape-client/src/main/java/IterableDualNodeQueue.java b/runescape-client/src/main/java/IterableDualNodeQueue.java index 9a13a52953..43004b0b92 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("jz") +@ObfuscatedName("ji") @Implements("IterableDualNodeQueue") public class IterableDualNodeQueue implements Iterable { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lfn;" + signature = "Lgw;" ) @Export("sentinel") public DualNode sentinel; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lfn;" + signature = "Lgw;" ) @Export("head") DualNode head; @@ -26,7 +26,7 @@ public class IterableDualNodeQueue implements Iterable { this.sentinel.nextDual = this.sentinel; } - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("clear") public void clear() { while (this.sentinel.previousDual != this.sentinel) { @@ -35,9 +35,9 @@ public class IterableDualNodeQueue implements Iterable { } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lfn;)V" + signature = "(Lgw;)V" ) @Export("add") public void add(DualNode var1) { @@ -51,9 +51,9 @@ public class IterableDualNodeQueue implements Iterable { var1.previousDual.nextDual = var1; } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "()Lfn;" + signature = "()Lgw;" ) @Export("removeLast") public DualNode removeLast() { @@ -66,18 +66,18 @@ public class IterableDualNodeQueue implements Iterable { } } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "()Lfn;" + signature = "()Lgw;" ) @Export("last") public DualNode last() { return this.previousOrLast((DualNode)null); } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(Lfn;)Lfn;" + signature = "(Lgw;)Lgw;" ) @Export("previousOrLast") DualNode previousOrLast(DualNode var1) { @@ -97,9 +97,9 @@ public class IterableDualNodeQueue implements Iterable { } } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "()Lfn;" + signature = "()Lgw;" ) @Export("previous") public DualNode previous() { @@ -117,9 +117,9 @@ public class IterableDualNodeQueue implements Iterable { return new IterableDualNodeQueueIterator(this); } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Lfn;Lfn;)V" + signature = "(Lgw;Lgw;)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 5c76b38610..eaf67c8ce8 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("jw") +@ObfuscatedName("jo") @Implements("IterableDualNodeQueueIterator") public class IterableDualNodeQueueIterator implements Iterator { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Ljz;" + signature = "Lji;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lfn;" + signature = "Lgw;" ) @Export("head") DualNode head; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lfn;" + signature = "Lgw;" ) @Export("last") DualNode last; @ObfuscatedSignature( - signature = "(Ljz;)V" + signature = "(Lji;)V" ) IterableDualNodeQueueIterator(IterableDualNodeQueue var1) { this.last = null; @@ -54,7 +54,11 @@ public class IterableDualNodeQueueIterator implements Iterator { } public void remove() { - this.last.removeDual(); - this.last = null; + if (this.last == null) { + throw new IllegalStateException(); + } else { + 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 a30d7901a4..66f7beaceb 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("jm") +@ObfuscatedName("jl") @Implements("IterableNodeDeque") public class IterableNodeDeque implements Iterable, Collection { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Lgk;" ) @Export("sentinel") Node sentinel; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Lgk;" ) - Node field3537; + Node field3499; public IterableNodeDeque() { this.sentinel = new Node(); @@ -26,7 +26,7 @@ public class IterableNodeDeque implements Iterable, Collection { this.sentinel.next = this.sentinel; } - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("rsClear") public void rsClear() { while (this.sentinel.previous != this.sentinel) { @@ -35,9 +35,9 @@ public class IterableNodeDeque implements Iterable, Collection { } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lfb;)V" + signature = "(Lgk;)V" ) @Export("addFirst") public void addFirst(Node var1) { @@ -51,9 +51,9 @@ public class IterableNodeDeque implements Iterable, Collection { var1.previous.next = var1; } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Lfb;)V" + signature = "(Lgk;)V" ) @Export("addLast") public void addLast(Node var1) { @@ -67,20 +67,20 @@ public class IterableNodeDeque implements Iterable, Collection { var1.previous.next = var1; } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "()Lfb;" + signature = "()Lgk;" ) @Export("last") public Node last() { - return this.method4902((Node)null); + return this.method4847((Node)null); } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(Lfb;)Lfb;" + signature = "(Lgk;)Lgk;" ) - Node method4902(Node var1) { + Node method4847(Node var1) { Node var2; if (var1 == null) { var2 = this.sentinel.previous; @@ -89,32 +89,32 @@ public class IterableNodeDeque implements Iterable, Collection { } if (var2 == this.sentinel) { - this.field3537 = null; + this.field3499 = null; return null; } else { - this.field3537 = var2.previous; + this.field3499 = var2.previous; return var2; } } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "()Lfb;" + signature = "()Lgk;" ) @Export("previous") public Node previous() { - Node var1 = this.field3537; + Node var1 = this.field3499; if (var1 == this.sentinel) { - this.field3537 = null; + this.field3499 = null; return null; } else { - this.field3537 = var1.previous; + this.field3499 = var1.previous; return var1; } } - @ObfuscatedName("y") - int method4904() { + @ObfuscatedName("x") + int method4842() { int var1 = 0; for (Node var2 = this.sentinel.previous; var2 != this.sentinel; var2 = var2.previous) { @@ -124,17 +124,17 @@ public class IterableNodeDeque implements Iterable, Collection { return var1; } - @ObfuscatedName("w") - public boolean method4911() { + @ObfuscatedName("a") + public boolean method4843() { return this.sentinel.previous == this.sentinel; } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "()[Lfb;" + signature = "()[Lgk;" ) - Node[] method4906() { - Node[] var1 = new Node[this.method4904()]; + Node[] method4844() { + Node[] var1 = new Node[this.method4842()]; int var2 = 0; for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { @@ -144,29 +144,25 @@ public class IterableNodeDeque implements Iterable, Collection { return var1; } - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lfb;)Z" + signature = "(Lgk;)Z" ) - boolean method4909(Node var1) { + boolean method4848(Node var1) { this.addFirst(var1); return true; } - public void clear() { - this.rsClear(); + public Object[] toArray() { + return this.method4844(); + } + + public Iterator iterator() { + return new IterableNodeDequeDescendingIterator(this); } public boolean isEmpty() { - return this.method4911(); - } - - public boolean contains(Object var1) { - throw new RuntimeException(); - } - - public Object[] toArray() { - return this.method4906(); + return this.method4843(); } public Object[] toArray(Object[] var1) { @@ -183,12 +179,12 @@ public class IterableNodeDeque implements Iterable, Collection { throw new RuntimeException(); } - public boolean addAll(Collection var1) { + public boolean containsAll(Collection var1) { throw new RuntimeException(); } - public boolean add(Object var1) { - return this.method4909((Node)var1); + public void clear() { + this.rsClear(); } public boolean equals(Object var1) { @@ -199,29 +195,33 @@ public class IterableNodeDeque implements Iterable, Collection { return super.hashCode(); } - public boolean retainAll(Collection var1) { - throw new RuntimeException(); + public int size() { + return this.method4842(); + } + + public boolean add(Object var1) { + return this.method4848((Node)var1); } public boolean removeAll(Collection var1) { throw new RuntimeException(); } - public int size() { - return this.method4904(); - } - - public boolean containsAll(Collection var1) { + public boolean addAll(Collection var1) { throw new RuntimeException(); } - public Iterator iterator() { - return new IterableNodeDequeDescendingIterator(this); + public boolean retainAll(Collection var1) { + throw new RuntimeException(); } - @ObfuscatedName("g") + public boolean contains(Object var1) { + throw new RuntimeException(); + } + + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lfb;Lfb;)V" + signature = "(Lgk;Lgk;)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 33c80d3139..55f7a370d0 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("jp") +@ObfuscatedName("ja") @Implements("IterableNodeDequeDescendingIterator") public class IterableNodeDequeDescendingIterator implements Iterator { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Ljm;" + signature = "Ljl;" ) @Export("deque") IterableNodeDeque deque; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Lgk;" ) - Node field3545; - @ObfuscatedName("b") + Node field3509; + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Lgk;" ) @Export("last") Node last; @ObfuscatedSignature( - signature = "(Ljm;)V" + signature = "(Ljl;)V" ) IterableNodeDequeDescendingIterator(IterableNodeDeque var1) { this.last = null; this.setDeque(var1); } - @ObfuscatedName("y") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljm;)V" + signature = "(Ljl;)V" ) @Export("setDeque") void setDeque(IterableNodeDeque var1) { @@ -43,32 +43,32 @@ public class IterableNodeDequeDescendingIterator implements Iterator { this.start(); } - @ObfuscatedName("w") + @ObfuscatedName("o") @Export("start") void start() { - this.field3545 = this.deque != null ? this.deque.sentinel.previous : null; + this.field3509 = this.deque != null ? this.deque.sentinel.previous : null; this.last = null; } + public Object next() { + Node var1 = this.field3509; + if (var1 == this.deque.sentinel) { + var1 = null; + this.field3509 = null; + } else { + this.field3509 = var1.previous; + } + + this.last = var1; + return var1; + } + + public boolean hasNext() { + return this.deque.sentinel != this.field3509; + } + public void remove() { this.last.remove(); this.last = null; } - - public boolean hasNext() { - return this.deque.sentinel != this.field3545; - } - - public Object next() { - Node var1 = this.field3545; - if (var1 == this.deque.sentinel) { - var1 = null; - this.field3545 = null; - } else { - this.field3545 = var1.previous; - } - - this.last = var1; - return var1; - } } diff --git a/runescape-client/src/main/java/IterableNodeHashTable.java b/runescape-client/src/main/java/IterableNodeHashTable.java index a4777853fd..74e65d17d0 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("lb") +@ObfuscatedName("lc") @Implements("IterableNodeHashTable") public final class IterableNodeHashTable implements Iterable { - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("size") int size; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "[Lfb;" + signature = "[Lgk;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Lgk;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Lgk;" ) @Export("current") Node current; - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("index") int index; @@ -45,9 +45,9 @@ public final class IterableNodeHashTable implements Iterable { } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(J)Lfb;" + signature = "(J)Lgk;" ) @Export("get") public Node get(long var1) { @@ -65,9 +65,9 @@ public final class IterableNodeHashTable implements Iterable { return null; } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lfb;J)V" + signature = "(Lgk;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("b") + @ObfuscatedName("y") @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("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "()Lfb;" + signature = "()Lgk;" ) @Export("first") public Node first() { @@ -113,9 +113,9 @@ public final class IterableNodeHashTable implements Iterable { return this.next(); } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "()Lfb;" + signature = "()Lgk;" ) @Export("next") public Node next() { diff --git a/runescape-client/src/main/java/IterableNodeHashTableIterator.java b/runescape-client/src/main/java/IterableNodeHashTableIterator.java index f183e67850..1e260028e2 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("ll") +@ObfuscatedName("la") @Implements("IterableNodeHashTableIterator") public class IterableNodeHashTableIterator implements Iterator { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Llb;" + signature = "Llc;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Lgk;" ) @Export("head") Node head; - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("index") int index; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Lgk;" ) @Export("last") Node last; @ObfuscatedSignature( - signature = "(Llb;)V" + signature = "(Llc;)V" ) IterableNodeHashTableIterator(IterableNodeHashTable var1) { this.last = null; @@ -38,7 +38,7 @@ public class IterableNodeHashTableIterator implements Iterator { this.start(); } - @ObfuscatedName("y") + @ObfuscatedName("c") @Export("start") void start() { this.head = this.hashTable.buckets[0].previous; @@ -46,23 +46,6 @@ public class IterableNodeHashTableIterator implements Iterator { 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; - } - } - public Object next() { Node var1; if (this.hashTable.buckets[this.index - 1] != this.head) { @@ -93,4 +76,21 @@ public class IterableNodeHashTableIterator implements Iterator { 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 9ca764084f..a029bcfff1 100644 --- a/runescape-client/src/main/java/JagexCache.java +++ b/runescape-client/src/main/java/JagexCache.java @@ -5,171 +5,42 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fs") +@ObfuscatedName("fr") @Implements("JagexCache") public class JagexCache { - @ObfuscatedName("g") - @Export("JagexCache_locationFile") - public static File JagexCache_locationFile; @ObfuscatedName("p") + @Export("cacheDir") + static File cacheDir; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 618561373 + intValue = -593345699 ) @Export("idxCount") public static int idxCount; - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lmb;" + signature = "Lmy;" ) @Export("JagexCache_randomDat") public static BufferedFile JagexCache_randomDat; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Lmb;" + signature = "Lmy;" ) @Export("JagexCache_dat2File") public static BufferedFile JagexCache_dat2File; - @ObfuscatedName("e") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lmb;" + signature = "Lmy;" ) @Export("JagexCache_idx255File") public static BufferedFile JagexCache_idx255File; - @ObfuscatedName("c") - public static String[] field2046; - @ObfuscatedName("v") - @Export("userHomeDirectory") - public static String userHomeDirectory; - @ObfuscatedName("ct") - @Export("mouseCam") - static boolean mouseCam; - @ObfuscatedName("fq") - @ObfuscatedSignature( - signature = "Lky;" - ) - @Export("fontBold12") - static Font fontBold12; - @ObfuscatedName("ji") - @ObfuscatedSignature( - signature = "Ldb;" - ) - @Export("textureProvider") - static TextureProvider textureProvider; + @ObfuscatedName("t") + static String[] field2024; static { JagexCache_randomDat = null; JagexCache_dat2File = null; JagexCache_idx255File = null; } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "87" - ) - public static void method3540(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("b") - @ObfuscatedSignature( - signature = "(IIIB)I", - garbageValue = "12" - ) - static int method3531(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("jd") - @ObfuscatedSignature( - signature = "(IIIIIB)V", - garbageValue = "11" - ) - @Export("drawScrollBar") - static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { - GrandExchangeOfferTotalQuantityComparator.scrollBarSprites[0].drawAt(var0, var1); - GrandExchangeOfferTotalQuantityComparator.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field705); - 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.field706); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field708); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field708); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field708); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field708); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field707); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field707); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var5 + var1 + 15, 16, Client.field707); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field707); - } - - @ObfuscatedName("lq") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "66" - ) - static void method3539() { - if (Client.field826 && class215.localPlayer != null) { - int var0 = class215.localPlayer.pathX[0]; - int var1 = class215.localPlayer.pathY[0]; - if (var0 < 0 || var1 < 0 || var0 >= 104 || var1 >= 104) { - return; - } - - class80.oculusOrbFocalPointX = class215.localPlayer.x; - int var2 = class195.getTileHeight(class215.localPlayer.x, class215.localPlayer.y, ClientPacket.Client_plane) - Client.camFollowHeight; - if (var2 < GrandExchangeOfferAgeComparator.field78) { - GrandExchangeOfferAgeComparator.field78 = var2; - } - - class81.oculusOrbFocalPointY = class215.localPlayer.y; - Client.field826 = false; - } - - } } diff --git a/runescape-client/src/main/java/KeyHandler.java b/runescape-client/src/main/java/KeyHandler.java index 65736aaf76..9f34fd86ef 100644 --- a/runescape-client/src/main/java/KeyHandler.java +++ b/runescape-client/src/main/java/KeyHandler.java @@ -8,91 +8,97 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("an") +@ObfuscatedName("aj") @Implements("KeyHandler") public final class KeyHandler implements KeyListener, FocusListener { - @ObfuscatedName("u") + @ObfuscatedName("sz") + @ObfuscatedGetter( + intValue = 1848557625 + ) + @Export("foundItemIdCount") + static int foundItemIdCount; + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lan;" + signature = "Laj;" ) @Export("KeyHandler_instance") public static KeyHandler KeyHandler_instance; - @ObfuscatedName("cb") + @ObfuscatedName("ca") @Export("KeyHandler_pressedKeys") public static boolean[] KeyHandler_pressedKeys; - @ObfuscatedName("cj") - public static int[] field394; - @ObfuscatedName("cq") - @ObfuscatedGetter( - intValue = -1692685617 - ) - public static int field393; - @ObfuscatedName("ci") - @ObfuscatedGetter( - intValue = 1179821355 - ) - public static int field397; - @ObfuscatedName("cu") - static char[] field395; - @ObfuscatedName("cs") - static int[] field396; - @ObfuscatedName("cc") - public static int[] field378; - @ObfuscatedName("cp") - @ObfuscatedGetter( - intValue = -157249247 - ) - public static int field398; + @ObfuscatedName("ck") + public static int[] field371; @ObfuscatedName("ce") @ObfuscatedGetter( - intValue = -1356974525 + intValue = 2031779971 ) - public static int field399; - @ObfuscatedName("ca") + public static int field372; + @ObfuscatedName("cu") @ObfuscatedGetter( - intValue = -632301517 + intValue = 1093649123 ) - public static int field400; - @ObfuscatedName("cf") + public static int field373; + @ObfuscatedName("cg") + static char[] field385; + @ObfuscatedName("ct") + static int[] field375; + @ObfuscatedName("cr") + public static int[] field376; + @ObfuscatedName("cy") @ObfuscatedGetter( - intValue = 731449573 + intValue = -805709065 ) - public static int field384; - @ObfuscatedName("cx") + public static int field377; + @ObfuscatedName("cz") @ObfuscatedGetter( - intValue = -1978604411 + intValue = -924316299 + ) + public static int field378; + @ObfuscatedName("cm") + @ObfuscatedGetter( + intValue = -1721204763 + ) + public static int field386; + @ObfuscatedName("cl") + @ObfuscatedGetter( + intValue = 485156941 + ) + public static int field380; + @ObfuscatedName("ci") + @ObfuscatedGetter( + intValue = 1979458191 ) @Export("KeyHandler_idleCycles") public static volatile int KeyHandler_idleCycles; - @ObfuscatedName("cz") + @ObfuscatedName("cc") @Export("KeyHandler_keyCodes") static int[] KeyHandler_keyCodes; - @ObfuscatedName("dc") - @ObfuscatedSignature( - signature = "Lfo;" + @ObfuscatedName("kz") + @ObfuscatedGetter( + intValue = -1228958525 ) - @Export("js5SocketTask") - static Task js5SocketTask; - @ObfuscatedName("gi") - @ObfuscatedSignature( - signature = "[Lln;" + @Export("menuWidth") + static int menuWidth; + @ObfuscatedName("lq") + @ObfuscatedGetter( + intValue = -1751180227 ) - @Export("crossSprites") - static Sprite[] crossSprites; + @Export("selectedItemSlot") + static int selectedItemSlot; static { KeyHandler_instance = new KeyHandler(); KeyHandler_pressedKeys = new boolean[112]; - field394 = new int[128]; - field393 = 0; - field397 = 0; - field395 = new char[128]; - field396 = new int[128]; - field378 = new int[128]; - field398 = 0; - field399 = 0; - field400 = 0; - field384 = 0; + field371 = new int[128]; + field372 = 0; + field373 = 0; + field385 = new char[128]; + field375 = new int[128]; + field376 = new int[128]; + field377 = 0; + field378 = 0; + field386 = 0; + field380 = 0; KeyHandler_idleCycles = 0; KeyHandler_keyCodes = new int[]{-1, -1, -1, -1, -1, -1, -1, -1, 85, 80, 84, -1, 91, -1, -1, -1, 81, 82, 86, -1, -1, -1, -1, -1, -1, -1, -1, 13, -1, -1, -1, -1, 83, 104, 105, 103, 102, 96, 98, 97, 99, -1, -1, -1, -1, -1, -1, -1, 25, 16, 17, 18, 19, 20, 21, 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, 48, 68, 66, 50, 34, 51, 52, 53, 39, 54, 55, 56, 70, 69, 40, 41, 32, 35, 49, 36, 38, 67, 33, 65, 37, 64, -1, -1, -1, -1, -1, 228, 231, 227, 233, 224, 219, 225, 230, 226, 232, 89, 87, -1, 88, 229, 90, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, -1, -1, -1, 101, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 100, -1, 87, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; } @@ -112,21 +118,21 @@ public final class KeyHandler implements KeyListener, FocusListener { var2 = -1; } - if (field397 >= 0 && var2 >= 0) { - field394[field397] = var2; - field397 = field397 + 1 & 127; - if (field397 == field393) { - field397 = -1; + if (field373 >= 0 && var2 >= 0) { + field371[field373] = var2; + field373 = field373 + 1 & 127; + if (field372 == field373) { + field373 = -1; } } int var3; if (var2 >= 0) { - var3 = field400 + 1 & 127; - if (var3 != field399) { - field396[field400] = var2; - field395[field400] = 0; - field400 = var3; + var3 = field386 + 1 & 127; + if (var3 != field378) { + field375[field386] = var2; + field385[field386] = 0; + field386 = var3; } } @@ -147,11 +153,11 @@ public final class KeyHandler implements KeyListener, FocusListener { var2 = -1; } - if (field397 >= 0 && var2 >= 0) { - field394[field397] = ~var2; - field397 = field397 + 1 & 127; - if (field393 == field397) { - field397 = -1; + if (field373 >= 0 && var2 >= 0) { + field371[field373] = ~var2; + field373 = field373 + 1 & 127; + if (field372 == field373) { + field373 = -1; } } } @@ -185,11 +191,11 @@ public final class KeyHandler implements KeyListener, FocusListener { } if (var3) { - int var4 = field400 + 1 & 127; - if (var4 != field399) { - field396[field400] = -1; - field395[field400] = var2; - field400 = var4; + int var4 = field386 + 1 & 127; + if (var4 != field378) { + field375[field386] = -1; + field385[field386] = var2; + field386 = var4; } } } @@ -200,7 +206,7 @@ public final class KeyHandler implements KeyListener, FocusListener { public final synchronized void focusLost(FocusEvent var1) { if (KeyHandler_instance != null) { - field397 = -1; + field373 = -1; } } @@ -208,27 +214,218 @@ public final class KeyHandler implements KeyListener, FocusListener { public final void focusGained(FocusEvent var1) { } - @ObfuscatedName("g") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "-1842902018" + signature = "(I)Z", + garbageValue = "-1237064123" ) - public static int method843(int var0, int var1) { - int var2; - for (var2 = 0; var1 > 0; --var1) { - var2 = var2 << 1 | var0 & 1; - var0 >>>= 1; + @Export("isKeyDown") + public static final boolean isKeyDown() { + synchronized(KeyHandler_instance) { + if (field380 == field378) { + return false; + } else { + VertexNormal.field1732 = field375[field378]; + TileItemPile.field1521 = field385[field378]; + field378 = field378 + 1 & 127; + return true; + } + } + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "(IIIZII)J", + garbageValue = "2043386608" + ) + @Export("calculateTag") + public static long calculateTag(int var0, int var1, int var2, boolean var3, int var4) { + long var5 = (long)((var0 & 127) << 0 | (var1 & 127) << 7 | (var2 & 3) << 14) | ((long)var4 & 4294967295L) << 17; + if (var3) { + var5 |= 65536L; } - return var2; + return var5; } - @ObfuscatedName("gi") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "1035079634" + signature = "(Lbe;I)V", + garbageValue = "1892265582" ) - static final void method837(int var0, int var1, int var2, int var3) { - class2.method31(); + @Export("changeWorld") + static void changeWorld(World var0) { + if (var0.isMembersOnly() != Client.isMembersWorld) { + Client.isMembersWorld = var0.isMembersOnly(); + class32.method557(var0.isMembersOnly()); + } + + CollisionMap.worldHost = var0.host; + Client.worldId = var0.id; + Client.worldProperties = var0.properties; + class197.port1 = Client.gameBuild == 0 ? 43594 : var0.id + 40000; + MouseRecorder.port2 = Client.gameBuild == 0 ? 443 : var0.id + 50000; + WorldMapData_1.port3 = class197.port1; + } + + @ObfuscatedName("hn") + @ObfuscatedSignature( + signature = "(IIII)V", + garbageValue = "-616372241" + ) + @Export("worldToScreen") + static final void worldToScreen(int var0, int var1, int var2) { + if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { + int var3 = ScriptEvent.getTileHeight(var0, var1, UrlRequest.Client_plane) - var2; + var0 -= MusicPatchNode2.cameraX; + var3 -= class60.cameraY; + var1 -= UserComparator9.cameraZ; + int var4 = Rasterizer3D.Rasterizer3D_sine[ViewportMouse.cameraPitch]; + int var5 = Rasterizer3D.Rasterizer3D_cosine[ViewportMouse.cameraPitch]; + int var6 = Rasterizer3D.Rasterizer3D_sine[WorldMapLabelSize.cameraYaw]; + int var7 = Rasterizer3D.Rasterizer3D_cosine[WorldMapLabelSize.cameraYaw]; + int var8 = var6 * var1 + var0 * var7 >> 16; + var1 = var7 * var1 - var0 * var6 >> 16; + var0 = var8; + var8 = var3 * var5 - var4 * var1 >> 16; + var1 = var3 * var4 + var5 * var1 >> 16; + if (var1 >= 50) { + Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; + Client.viewportTempY = var8 * Client.viewportZoom / var1 + Client.viewportHeight / 2; + } else { + Client.viewportTempX = -1; + Client.viewportTempY = -1; + } + + } else { + Client.viewportTempX = -1; + Client.viewportTempY = -1; + } + } + + @ObfuscatedName("iu") + @ObfuscatedSignature( + signature = "(IIIILjava/lang/String;I)V", + garbageValue = "2129619749" + ) + @Export("widgetDefaultMenuAction") + static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { + Widget var5 = BZip2State.getWidgetChild(var1, var2); + if (var5 != null) { + if (var5.onOp != null) { + ScriptEvent var6 = new ScriptEvent(); + var6.widget = var5; + var6.opIndex = var0; + var6.targetName = var4; + var6.args = var5.onOp; + Client.runScriptEvent(var6); + } + + boolean var11 = true; + if (var5.contentType > 0) { + var11 = GrandExchangeOfferNameComparator.method136(var5); + } + + if (var11) { + int var8 = WorldMapSection0.getWidgetClickMask(var5); + int var9 = var0 - 1; + boolean var7 = (var8 >> var9 + 1 & 1) != 0; + if (var7) { + PacketBufferNode var10; + if (var0 == 1) { + var10 = class2.getPacketBufferNode(ClientPacket.field2279, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 2) { + var10 = class2.getPacketBufferNode(ClientPacket.field2254, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 3) { + var10 = class2.getPacketBufferNode(ClientPacket.field2240, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 4) { + var10 = class2.getPacketBufferNode(ClientPacket.field2205, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 5) { + var10 = class2.getPacketBufferNode(ClientPacket.field2262, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 6) { + var10 = class2.getPacketBufferNode(ClientPacket.field2204, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 7) { + var10 = class2.getPacketBufferNode(ClientPacket.field2186, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 8) { + var10 = class2.getPacketBufferNode(ClientPacket.field2242, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 9) { + var10 = class2.getPacketBufferNode(ClientPacket.field2255, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 10) { + var10 = class2.getPacketBufferNode(ClientPacket.field2200, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + } + } + } + } + + @ObfuscatedName("le") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "1409617805" + ) + static void method835() { + if (Client.oculusOrbState == 1) { + Client.field751 = true; + } + } } diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java index e01f50147c..e041280775 100644 --- a/runescape-client/src/main/java/KitDefinition.java +++ b/runescape-client/src/main/java/KitDefinition.java @@ -4,58 +4,52 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ie") +@ObfuscatedName("ix") @Implements("KitDefinition") public class KitDefinition extends DualNode { @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lhf;" + signature = "Lhz;" + ) + @Export("KitDefinition_archive") + public static AbstractArchive KitDefinition_archive; + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "Lhz;" ) @Export("KitDefinition_modelsArchive") - static AbstractArchive KitDefinition_modelsArchive; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 469619503 - ) - @Export("KitDefinition_fileCount") - public static int KitDefinition_fileCount; - @ObfuscatedName("g") + public static AbstractArchive KitDefinition_modelsArchive; + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lef;" + signature = "Leb;" ) @Export("KitDefinition_cached") - static EvictingDualNodeHashTable KitDefinition_cached; - @ObfuscatedName("bb") - @ObfuscatedSignature( - signature = "Llm;" - ) - @Export("worldSelectRightSprite") - static IndexedSprite worldSelectRightSprite; - @ObfuscatedName("z") + public static EvictingDualNodeHashTable KitDefinition_cached; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 404247585 + intValue = -81480953 ) @Export("bodypartID") public int bodypartID; - @ObfuscatedName("p") + @ObfuscatedName("b") @Export("models2") int[] models2; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("w") + @ObfuscatedName("a") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("k") + @ObfuscatedName("c") @Export("models") int[] models; - @ObfuscatedName("x") + @ObfuscatedName("o") @Export("nonSelectable") public boolean nonSelectable; @@ -69,10 +63,10 @@ public class KitDefinition extends DualNode { this.nonSelectable = false; } - @ObfuscatedName("b") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkg;I)V", - garbageValue = "-888948213" + signature = "(Lkq;B)V", + garbageValue = "2" ) @Export("decode") void decode(Buffer var1) { @@ -86,10 +80,10 @@ public class KitDefinition extends DualNode { } } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Lkg;II)V", - garbageValue = "-1758313973" + signature = "(Lkq;II)V", + garbageValue = "1044469626" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -132,10 +126,10 @@ public class KitDefinition extends DualNode { } - @ObfuscatedName("z") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1861944698" + garbageValue = "963507021" ) @Export("ready") public boolean ready() { @@ -156,8 +150,8 @@ public class KitDefinition extends DualNode { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(B)Ldq;", - garbageValue = "20" + signature = "(I)Ldd;", + garbageValue = "-2124691524" ) @Export("getModelData") public ModelData getModelData() { @@ -194,12 +188,12 @@ public class KitDefinition extends DualNode { } } - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "1" + signature = "(I)Z", + garbageValue = "-2147315248" ) - public boolean method4535() { + public boolean method4430() { boolean var1 = true; for (int var2 = 0; var2 < 5; ++var2) { @@ -211,10 +205,10 @@ public class KitDefinition extends DualNode { return var1; } - @ObfuscatedName("y") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(B)Ldq;", - garbageValue = "-19" + signature = "(I)Ldd;", + garbageValue = "285543831" ) @Export("getKitDefinitionModels") public ModelData getKitDefinitionModels() { @@ -243,4 +237,27 @@ public class KitDefinition extends DualNode { return var5; } + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(II)Lis;", + garbageValue = "-2132150843" + ) + @Export("StructDefinition_getStructDefinition") + public static StructDefinition StructDefinition_getStructDefinition(int var0) { + StructDefinition var1 = (StructDefinition)StructDefinition.StructDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = StructDefinition.StructDefinition_archive.takeFile(34, var0); + var1 = new StructDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); + StructDefinition.StructDefinition_cached.put(var1, (long)var0); + return var1; + } + } } diff --git a/runescape-client/src/main/java/Language.java b/runescape-client/src/main/java/Language.java index 0137cf4523..6b3c75006b 100644 --- a/runescape-client/src/main/java/Language.java +++ b/runescape-client/src/main/java/Language.java @@ -1,103 +1,113 @@ -import java.util.Iterator; import java.util.Locale; 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("gc") +@ObfuscatedName("gs") @Implements("Language") public class Language implements Enumerated { - @ObfuscatedName("u") + @ObfuscatedName("pg") @ObfuscatedSignature( - signature = "Lgc;" + signature = "Lls;" + ) + @Export("sceneMinimapSprite") + static Sprite sceneMinimapSprite; + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "Lgs;" ) @Export("Language_EN") public static final Language Language_EN; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lgc;" + signature = "Lgs;" ) @Export("Language_DE") static final Language Language_DE; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lgc;" + signature = "Lgs;" ) @Export("Language_FR") public static final Language Language_FR; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lgc;" + signature = "Lgs;" ) @Export("Language_PT") static final Language Language_PT; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lgc;" + signature = "Lgs;" ) @Export("Language_NL") static final Language Language_NL; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "Lgc;" + signature = "Lgs;" ) @Export("Language_ES") public static final Language Language_ES; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lgc;" + signature = "Lgs;" ) @Export("Language_ES_MX") static final Language Language_ES_MX; - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "[Lgc;" + signature = "[Lgs;" ) @Export("Language_valuesOrdered") public static final Language[] Language_valuesOrdered; - @ObfuscatedName("y") - final String field2364; - @ObfuscatedName("w") + @ObfuscatedName("hr") + @ObfuscatedGetter( + intValue = 1873129621 + ) + @Export("oculusOrbFocalPointY") + static int oculusOrbFocalPointY; + @ObfuscatedName("x") + final String field2342; + @ObfuscatedName("a") @Export("language") final String language; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -936078223 + intValue = -1397403577 ) @Export("id") final int id; static { - Language_EN = new Language("EN", "en", "English", class192.field2381, 0, "GB"); - Language_DE = new Language("DE", "de", "German", class192.field2381, 1, "DE"); - Language_FR = new Language("FR", "fr", "French", class192.field2381, 2, "FR"); - Language_PT = new Language("PT", "pt", "Portuguese", class192.field2381, 3, "BR"); - Language_NL = new Language("NL", "nl", "Dutch", class192.field2392, 4, "NL"); - Language_ES = new Language("ES", "es", "Spanish", class192.field2392, 5, "ES"); - Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", class192.field2381, 6, "MX"); - Language[] var0 = method3703(); + Language_EN = new Language("EN", "en", "English", class192.field2369, 0, "GB"); + Language_DE = new Language("DE", "de", "German", class192.field2369, 1, "DE"); + Language_FR = new Language("FR", "fr", "French", class192.field2369, 2, "FR"); + Language_PT = new Language("PT", "pt", "Portuguese", class192.field2369, 3, "BR"); + Language_NL = new Language("NL", "nl", "Dutch", class192.field2360, 4, "NL"); + Language_ES = new Language("ES", "es", "Spanish", class192.field2360, 5, "ES"); + Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", class192.field2369, 6, "MX"); + Language[] var0 = new Language[]{Language_PT, Language_FR, Language_ES, Language_ES_MX, Language_NL, Language_DE, Language_EN}; Language_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;Lgo;ILjava/lang/String;)V" + signature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lgb;ILjava/lang/String;)V" ) Language(String var1, String var2, String var3, class192 var4, int var5, String var6) { - this.field2364 = var1; + this.field2342 = var1; this.language = var2; this.id = var5; if (var6 != null) { @@ -111,17 +121,17 @@ public class Language implements Enumerated { @ObfuscatedName("f") @ObfuscatedSignature( signature = "(I)Ljava/lang/String;", - garbageValue = "786287735" + garbageValue = "-1974687232" ) @Export("getLanguage") String getLanguage() { return this.language; } - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "7" + garbageValue = "-57" ) @Export("rsOrdinal") public int rsOrdinal() { @@ -132,275 +142,538 @@ public class Language implements Enumerated { return this.getLanguage().toLowerCase(Locale.ENGLISH); } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(II)Lhl;", - garbageValue = "-673897758" + signature = "(III)I", + garbageValue = "525966126" ) - @Export("getWidget") - public static Widget getWidget(int var0) { - int var1 = var0 >> 16; - int var2 = var0 & 65535; - if (FloorDecoration.Widget_interfaceComponents[var1] == null || FloorDecoration.Widget_interfaceComponents[var1][var2] == null) { - boolean var3 = UserComparator3.loadInterface(var1); - if (!var3) { - return null; + static int method3627(int var0, int var1) { + FloorOverlayDefinition var2 = Messages.FloorUnderlayDefinition_get(var0); + if (var2 == null) { + return var1; + } else if (var2.secondaryRgb >= 0) { + return var2.secondaryRgb | -16777216; + } else { + int var3; + if (var2.texture >= 0) { + var3 = class80.method2053(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var2.texture), 96); + return Rasterizer3D.Rasterizer3D_colorPalette[var3] | -16777216; + } else if (var2.primaryRgb == 16711935) { + return var1; + } else { + var3 = Varcs.method2168(var2.hue, var2.saturation, var2.lightness); + int var4 = class80.method2053(var3, 96); + return Rasterizer3D.Rasterizer3D_colorPalette[var4] | -16777216; } } - - return FloorDecoration.Widget_interfaceComponents[var1][var2]; - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(I)[Lgc;", - garbageValue = "-2103702236" - ) - static Language[] method3703() { - return new Language[]{Language_DE, Language_ES_MX, Language_FR, Language_ES, Language_PT, Language_EN, Language_NL}; } @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(II)Lin;", - garbageValue = "-1669366533" + signature = "([BIIB)Ljava/lang/String;", + garbageValue = "-119" ) - @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)); + public static String method3636(byte[] var0, int var1, int var2) { + StringBuilder var3 = new StringBuilder(); + + for (int var4 = var1; var4 < var2 + var1; var4 += 3) { + int var5 = var0[var4] & 255; + var3.append(class289.field3634[var5 >>> 2]); + if (var4 < var2 - 1) { + int var6 = var0[var4 + 1] & 255; + var3.append(class289.field3634[(var5 & 3) << 4 | var6 >>> 4]); + if (var4 < var2 - 2) { + int var7 = var0[var4 + 2] & 255; + var3.append(class289.field3634[(var6 & 15) << 2 | var7 >>> 6]).append(class289.field3634[var7 & 63]); + } else { + var3.append(class289.field3634[(var6 & 15) << 2]).append("="); + } + } else { + var3.append(class289.field3634[(var5 & 3) << 4]).append("=="); } - - EnumDefinition.EnumDefinition_cached.put(var1, (long)var0); - return var1; } + + return var3.toString(); } - @ObfuscatedName("t") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(ILci;ZS)I", - garbageValue = "32581" + signature = "(Lej;[Lfp;S)V", + garbageValue = "-23635" ) - static int method3710(int var0, Script var1, boolean var2) { - Widget var3 = getWidget(Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]); - if (var0 == ScriptOpcodes.IF_GETX) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.x; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETY) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.y; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.width; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.height; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETHIDE) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETLAYER) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.parentId; - return 1; - } else { - return 2; - } - } - - @ObfuscatedName("hi") - @ObfuscatedSignature( - signature = "(Lcg;IIB)V", - garbageValue = "24" - ) - static final void method3705(MenuAction var0, int var1, int var2) { - class32.menuAction(var0.param0, var0.param1, var0.opcode, var0.identifier, var0.action, var0.action, var1, var2); - } - - @ObfuscatedName("jw") - @ObfuscatedSignature( - signature = "(Lhl;II)I", - garbageValue = "1435184999" - ) - static final int method3719(Widget var0, int var1) { - if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { - try { - int[] var2 = var0.cs1Instructions[var1]; - int var3 = 0; - int var4 = 0; - byte var5 = 0; - - while (true) { - int var6 = var2[var4++]; - int var7 = 0; - byte var8 = 0; - if (var6 == 0) { - return var3; - } - - if (var6 == 1) { - var7 = Client.currentLevels[var2[var4++]]; - } - - if (var6 == 2) { - var7 = Client.levels[var2[var4++]]; - } - - if (var6 == 3) { - var7 = Client.experience[var2[var4++]]; - } - - int var9; - Widget var10; - int var11; - int var12; - if (var6 == 4) { - var9 = var2[var4++] << 16; - var9 += var2[var4++]; - var10 = getWidget(var9); - var11 = var2[var4++]; - if (var11 != -1 && (!Interpreter.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 = class215.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 = getWidget(var9); - var11 = var2[var4++]; - if (var11 != -1 && (!Interpreter.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 = FileSystem.getVarbit(var9); - } - - if (var6 == 15) { - var8 = 1; - } - - if (var6 == 16) { - var8 = 2; - } - - if (var6 == 17) { - var8 = 3; - } - - if (var6 == 18) { - var7 = class51.baseX * 64 + (class215.localPlayer.x >> 7); - } - - if (var6 == 19) { - var7 = VarcInt.baseY * 64 + (class215.localPlayer.y >> 7); - } - - if (var6 == 20) { - var7 = var2[var4++]; - } - - if (var8 == 0) { - if (var5 == 0) { - var3 += var7; + static final void method3624(Scene var0, CollisionMap[] var1) { + int var2; + int var3; + int var4; + int var5; + for (var2 = 0; var2 < 4; ++var2) { + for (var3 = 0; var3 < 104; ++var3) { + for (var4 = 0; var4 < 104; ++var4) { + if ((Tiles.Tiles_renderFlags[var2][var3][var4] & 1) == 1) { + var5 = var2; + if ((Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { + var5 = var2 - 1; } - if (var5 == 1) { - var3 -= var7; + if (var5 >= 0) { + var1[var5].setBlockedByFloor(var3, var4); } - - 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; } + + Tiles.field505 += (int)(Math.random() * 5.0D) - 2; + if (Tiles.field505 < -8) { + Tiles.field505 = -8; + } + + if (Tiles.field505 > 8) { + Tiles.field505 = 8; + } + + Tiles.field492 += (int)(Math.random() * 5.0D) - 2; + if (Tiles.field492 < -16) { + Tiles.field492 = -16; + } + + if (Tiles.field492 > 16) { + Tiles.field492 = 16; + } + + int var9; + int var10; + int var11; + int var12; + int var13; + int var14; + int var15; + int var16; + int[] var10000; + int var17; + int var18; + for (var2 = 0; var2 < 4; ++var2) { + byte[][] var42 = Tiles.field496[var2]; + var9 = (int)Math.sqrt(5100.0D); + var10 = var9 * 768 >> 8; + + int var19; + int var20; + for (var11 = 1; var11 < 103; ++var11) { + for (var12 = 1; var12 < 103; ++var12) { + var13 = Tiles.Tiles_heights[var2][var12 + 1][var11] - Tiles.Tiles_heights[var2][var12 - 1][var11]; + var14 = Tiles.Tiles_heights[var2][var12][var11 + 1] - Tiles.Tiles_heights[var2][var12][var11 - 1]; + var15 = (int)Math.sqrt((double)(var13 * var13 + var14 * var14 + 65536)); + var16 = (var13 << 8) / var15; + var17 = 65536 / var15; + var18 = (var14 << 8) / var15; + var19 = (var18 * -50 + var16 * -50 + var17 * -10) / var10 + 96; + var20 = (var42[var12][var11 + 1] >> 3) + (var42[var12 - 1][var11] >> 2) + (var42[var12][var11 - 1] >> 2) + (var42[var12 + 1][var11] >> 3) + (var42[var12][var11] >> 1); + ArchiveLoader.field512[var12][var11] = var19 - var20; + } + } + + for (var11 = 0; var11 < 104; ++var11) { + UrlRequest.Tiles_hue[var11] = 0; + MenuAction.Tiles_saturation[var11] = 0; + PacketBufferNode.Tiles_lightness[var11] = 0; + Tiles.Tiles_hueMultiplier[var11] = 0; + Varcs.field1244[var11] = 0; + } + + for (var11 = -5; var11 < 109; ++var11) { + for (var12 = 0; var12 < 104; ++var12) { + var13 = var11 + 5; + int var10002; + if (var13 >= 0 && var13 < 104) { + var14 = class14.field88[var2][var13][var12] & 255; + if (var14 > 0) { + FloorUnderlayDefinition var43 = WorldMapArea.method405(var14 - 1); + var10000 = UrlRequest.Tiles_hue; + var10000[var12] += var43.hue; + var10000 = MenuAction.Tiles_saturation; + var10000[var12] += var43.saturation; + var10000 = PacketBufferNode.Tiles_lightness; + var10000[var12] += var43.lightness; + var10000 = Tiles.Tiles_hueMultiplier; + var10000[var12] += var43.hueMultiplier; + var10002 = Varcs.field1244[var12]++; + } + } + + var14 = var11 - 5; + if (var14 >= 0 && var14 < 104) { + var15 = class14.field88[var2][var14][var12] & 255; + if (var15 > 0) { + FloorUnderlayDefinition var44 = WorldMapArea.method405(var15 - 1); + var10000 = UrlRequest.Tiles_hue; + var10000[var12] -= var44.hue; + var10000 = MenuAction.Tiles_saturation; + var10000[var12] -= var44.saturation; + var10000 = PacketBufferNode.Tiles_lightness; + var10000[var12] -= var44.lightness; + var10000 = Tiles.Tiles_hueMultiplier; + var10000[var12] -= var44.hueMultiplier; + var10002 = Varcs.field1244[var12]--; + } + } + } + + if (var11 >= 1 && var11 < 103) { + var12 = 0; + var13 = 0; + var14 = 0; + var15 = 0; + var16 = 0; + + for (var17 = -5; var17 < 109; ++var17) { + var18 = var17 + 5; + if (var18 >= 0 && var18 < 104) { + var12 += UrlRequest.Tiles_hue[var18]; + var13 += MenuAction.Tiles_saturation[var18]; + var14 += PacketBufferNode.Tiles_lightness[var18]; + var15 += Tiles.Tiles_hueMultiplier[var18]; + var16 += Varcs.field1244[var18]; + } + + var19 = var17 - 5; + if (var19 >= 0 && var19 < 104) { + var12 -= UrlRequest.Tiles_hue[var19]; + var13 -= MenuAction.Tiles_saturation[var19]; + var14 -= PacketBufferNode.Tiles_lightness[var19]; + var15 -= Tiles.Tiles_hueMultiplier[var19]; + var16 -= Varcs.field1244[var19]; + } + + if (var17 >= 1 && var17 < 103 && (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var11][var17] & 2) != 0 || (Tiles.Tiles_renderFlags[var2][var11][var17] & 16) == 0)) { + if (var2 < Tiles.Tiles_minPlane) { + Tiles.Tiles_minPlane = var2; + } + + var20 = class14.field88[var2][var11][var17] & 255; + int var21 = Tiles.field498[var2][var11][var17] & 255; + if (var20 > 0 || var21 > 0) { + int var22 = Tiles.Tiles_heights[var2][var11][var17]; + int var23 = Tiles.Tiles_heights[var2][var11 + 1][var17]; + int var24 = Tiles.Tiles_heights[var2][var11 + 1][var17 + 1]; + int var25 = Tiles.Tiles_heights[var2][var11][var17 + 1]; + int var26 = ArchiveLoader.field512[var11][var17]; + int var27 = ArchiveLoader.field512[var11 + 1][var17]; + int var28 = ArchiveLoader.field512[var11 + 1][var17 + 1]; + int var29 = ArchiveLoader.field512[var11][var17 + 1]; + int var30 = -1; + int var31 = -1; + int var32; + int var33; + if (var20 > 0) { + var32 = var12 * 256 / var15; + var33 = var13 / var16; + int var34 = var14 / var16; + var30 = GameShell.hslToRgb(var32, var33, var34); + var32 = var32 + Tiles.field505 & 255; + var34 += Tiles.field492; + if (var34 < 0) { + var34 = 0; + } else if (var34 > 255) { + var34 = 255; + } + + var31 = GameShell.hslToRgb(var32, var33, var34); + } + + if (var2 > 0) { + boolean var47 = true; + if (var20 == 0 && Tiles.field494[var2][var11][var17] != 0) { + var47 = false; + } + + if (var21 > 0 && !Messages.FloorUnderlayDefinition_get(var21 - 1).hideUnderlay) { + var47 = false; + } + + if (var47 && var23 == var22 && var22 == var24 && var22 == var25) { + var10000 = Tiles.field501[var2][var11]; + var10000[var17] |= 2340; + } + } + + var32 = 0; + if (var31 != -1) { + var32 = Rasterizer3D.Rasterizer3D_colorPalette[class32.method555(var31, 96)]; + } + + if (var21 == 0) { + var0.addTile(var2, var11, var17, 0, 0, -1, var22, var23, var24, var25, class32.method555(var30, var26), class32.method555(var30, var27), class32.method555(var30, var28), class32.method555(var30, var29), 0, 0, 0, 0, var32, 0); + } else { + var33 = Tiles.field494[var2][var11][var17] + 1; + byte var48 = Tiles.field493[var2][var11][var17]; + FloorOverlayDefinition var35 = Messages.FloorUnderlayDefinition_get(var21 - 1); + int var36 = var35.texture; + int var37; + int var38; + int var39; + int var40; + if (var36 >= 0) { + var38 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var36); + var37 = -1; + } else if (var35.primaryRgb == 16711935) { + var37 = -2; + var36 = -1; + var38 = -2; + } else { + var37 = GameShell.hslToRgb(var35.hue, var35.saturation, var35.lightness); + var39 = var35.hue + Tiles.field505 & 255; + var40 = var35.lightness + Tiles.field492; + if (var40 < 0) { + var40 = 0; + } else if (var40 > 255) { + var40 = 255; + } + + var38 = GameShell.hslToRgb(var39, var35.saturation, var40); + } + + var39 = 0; + if (var38 != -2) { + var39 = Rasterizer3D.Rasterizer3D_colorPalette[ScriptEvent.method1184(var38, 96)]; + } + + if (var35.secondaryRgb != -1) { + var40 = var35.secondaryHue + Tiles.field505 & 255; + int var41 = var35.secondaryLightness + Tiles.field492; + if (var41 < 0) { + var41 = 0; + } else if (var41 > 255) { + var41 = 255; + } + + var38 = GameShell.hslToRgb(var40, var35.secondarySaturation, var41); + var39 = Rasterizer3D.Rasterizer3D_colorPalette[ScriptEvent.method1184(var38, 96)]; + } + + var0.addTile(var2, var11, var17, var33, var48, var36, var22, var23, var24, var25, class32.method555(var30, var26), class32.method555(var30, var27), class32.method555(var30, var28), class32.method555(var30, var29), ScriptEvent.method1184(var37, var26), ScriptEvent.method1184(var37, var27), ScriptEvent.method1184(var37, var28), ScriptEvent.method1184(var37, var29), var32, var39); + } + } + } + } + } + } + + for (var11 = 1; var11 < 103; ++var11) { + for (var12 = 1; var12 < 103; ++var12) { + if ((Tiles.Tiles_renderFlags[var2][var12][var11] & 8) != 0) { + var17 = 0; + } else if (var2 > 0 && (Tiles.Tiles_renderFlags[1][var12][var11] & 2) != 0) { + var17 = var2 - 1; + } else { + var17 = var2; + } + + var0.setTileMinPlane(var2, var12, var11, var17); + } + } + + class14.field88[var2] = null; + Tiles.field498[var2] = null; + Tiles.field494[var2] = null; + Tiles.field493[var2] = null; + Tiles.field496[var2] = null; + } + + var0.method3191(-50, -10, -50); + + for (var2 = 0; var2 < 104; ++var2) { + for (var3 = 0; var3 < 104; ++var3) { + if ((Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { + var0.setLinkBelow(var2, var3); + } + } + } + + var2 = 1; + var3 = 2; + var4 = 4; + + for (var5 = 0; var5 < 4; ++var5) { + if (var5 > 0) { + var2 <<= 3; + var3 <<= 3; + var4 <<= 3; + } + + for (int var6 = 0; var6 <= var5; ++var6) { + for (int var7 = 0; var7 <= 104; ++var7) { + for (int var8 = 0; var8 <= 104; ++var8) { + short var46; + if ((Tiles.field501[var6][var8][var7] & var2) != 0) { + var9 = var7; + var10 = var7; + var11 = var6; + + for (var12 = var6; var9 > 0 && (Tiles.field501[var6][var8][var9 - 1] & var2) != 0; --var9) { + } + + while (var10 < 104 && (Tiles.field501[var6][var8][var10 + 1] & var2) != 0) { + ++var10; + } + + label462: + while (var11 > 0) { + for (var13 = var9; var13 <= var10; ++var13) { + if ((Tiles.field501[var11 - 1][var8][var13] & var2) == 0) { + break label462; + } + } + + --var11; + } + + label451: + while (var12 < var5) { + for (var13 = var9; var13 <= var10; ++var13) { + if ((Tiles.field501[var12 + 1][var8][var13] & var2) == 0) { + break label451; + } + } + + ++var12; + } + + var13 = (var10 - var9 + 1) * (var12 + 1 - var11); + if (var13 >= 8) { + var46 = 240; + var15 = Tiles.Tiles_heights[var12][var8][var9] - var46; + var16 = Tiles.Tiles_heights[var11][var8][var9]; + Scene.Scene_addOccluder(var5, 1, var8 * 128, var8 * 128, var9 * 128, var10 * 128 + 128, var15, var16); + + for (var17 = var11; var17 <= var12; ++var17) { + for (var18 = var9; var18 <= var10; ++var18) { + var10000 = Tiles.field501[var17][var8]; + var10000[var18] &= ~var2; + } + } + } + } + + if ((Tiles.field501[var6][var8][var7] & var3) != 0) { + var9 = var8; + var10 = var8; + var11 = var6; + + for (var12 = var6; var9 > 0 && (Tiles.field501[var6][var9 - 1][var7] & var3) != 0; --var9) { + } + + while (var10 < 104 && (Tiles.field501[var6][var10 + 1][var7] & var3) != 0) { + ++var10; + } + + label515: + while (var11 > 0) { + for (var13 = var9; var13 <= var10; ++var13) { + if ((Tiles.field501[var11 - 1][var13][var7] & var3) == 0) { + break label515; + } + } + + --var11; + } + + label504: + while (var12 < var5) { + for (var13 = var9; var13 <= var10; ++var13) { + if ((Tiles.field501[var12 + 1][var13][var7] & var3) == 0) { + break label504; + } + } + + ++var12; + } + + var13 = (var10 - var9 + 1) * (var12 + 1 - var11); + if (var13 >= 8) { + var46 = 240; + var15 = Tiles.Tiles_heights[var12][var9][var7] - var46; + var16 = Tiles.Tiles_heights[var11][var9][var7]; + Scene.Scene_addOccluder(var5, 2, var9 * 128, var10 * 128 + 128, var7 * 128, var7 * 128, var15, var16); + + for (var17 = var11; var17 <= var12; ++var17) { + for (var18 = var9; var18 <= var10; ++var18) { + var10000 = Tiles.field501[var17][var18]; + var10000[var7] &= ~var3; + } + } + } + } + + if ((Tiles.field501[var6][var8][var7] & var4) != 0) { + var9 = var8; + var10 = var8; + var11 = var7; + + for (var12 = var7; var11 > 0 && (Tiles.field501[var6][var8][var11 - 1] & var4) != 0; --var11) { + } + + while (var12 < 104 && (Tiles.field501[var6][var8][var12 + 1] & var4) != 0) { + ++var12; + } + + label568: + while (var9 > 0) { + for (var13 = var11; var13 <= var12; ++var13) { + if ((Tiles.field501[var6][var9 - 1][var13] & var4) == 0) { + break label568; + } + } + + --var9; + } + + label557: + while (var10 < 104) { + for (var13 = var11; var13 <= var12; ++var13) { + if ((Tiles.field501[var6][var10 + 1][var13] & var4) == 0) { + break label557; + } + } + + ++var10; + } + + if ((var12 - var11 + 1) * (var10 - var9 + 1) >= 4) { + var13 = Tiles.Tiles_heights[var6][var9][var11]; + Scene.Scene_addOccluder(var5, 4, var9 * 128, var10 * 128 + 128, var11 * 128, var12 * 128 + 128, var13, var13); + + for (var14 = var9; var14 <= var10; ++var14) { + for (var15 = var11; var15 <= var12; ++var15) { + var10000 = Tiles.field501[var6][var14]; + var10000[var15] &= ~var4; + } + } + } + } + } + } + } + } + } - @ObfuscatedName("ks") + @ObfuscatedName("fq") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "808353188" + signature = "(III)V", + garbageValue = "-38759309" ) - @Export("FriendSystem_invalidateIgnoreds") - static final void FriendSystem_invalidateIgnoreds() { - Iterator var0 = Messages.Messages_hashTable.iterator(); + static void method3634(int var0, int var1) { + int[] var2 = new int[9]; - while (var0.hasNext()) { - Message var1 = (Message)var0.next(); - var1.clearIsFromIgnored(); - } - - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.invalidateIgnoreds(); + for (int var3 = 0; var3 < var2.length; ++var3) { + int var4 = var3 * 32 + 15 + 128; + int var5 = var4 * 3 + 600; + int var7 = Rasterizer3D.Rasterizer3D_sine[var4]; + int var6 = WorldMapManager.method635(var5, var1); + var2[var3] = var6 * var7 >> 16; } + Scene.Scene_buildVisiblityMap(var2, 500, 800, var0 * 334 / var1, 334); } } diff --git a/runescape-client/src/main/java/Link.java b/runescape-client/src/main/java/Link.java index b4bf1a951a..9d52062d22 100644 --- a/runescape-client/src/main/java/Link.java +++ b/runescape-client/src/main/java/Link.java @@ -3,23 +3,23 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fd") +@ObfuscatedName("gj") @Implements("Link") public class Link { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lfd;" + signature = "Lgj;" ) @Export("previous") public Link previous; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lfd;" + signature = "Lgj;" ) @Export("next") public Link next; - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("remove") public void remove() { if (this.next != null) { diff --git a/runescape-client/src/main/java/LinkDeque.java b/runescape-client/src/main/java/LinkDeque.java index c9182483f1..406b8bc3cd 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("jj") +@ObfuscatedName("jw") @Implements("LinkDeque") public class LinkDeque { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lfd;" + signature = "Lgj;" ) @Export("sentinel") Link sentinel; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lfd;" + signature = "Lgj;" ) @Export("current") Link current; @@ -25,9 +25,9 @@ public class LinkDeque { this.sentinel.next = this.sentinel; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Lfd;)V" + signature = "(Lgj;)V" ) @Export("addFirst") public void addFirst(Link var1) { @@ -41,9 +41,9 @@ public class LinkDeque { var1.previous.next = var1; } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "()Lfd;" + signature = "()Lgj;" ) @Export("last") public Link last() { @@ -57,9 +57,9 @@ public class LinkDeque { } } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "()Lfd;" + signature = "()Lgj;" ) @Export("previous") public Link previous() { diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java index 254534c8c0..0a340889e4 100644 --- a/runescape-client/src/main/java/Login.java +++ b/runescape-client/src/main/java/Login.java @@ -1,3 +1,4 @@ +import java.security.SecureRandom; import java.text.DecimalFormat; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; @@ -5,142 +6,161 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cr") +@ObfuscatedName("cs") @Implements("Login") public class Login { - @ObfuscatedName("f") - static boolean field1194; - @ObfuscatedName("b") + @ObfuscatedName("i") + static boolean field1173; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -690855735 + intValue = 263999523 ) @Export("xPadding") static int xPadding; - @ObfuscatedName("z") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Llm;" + signature = "[Lli;" + ) + @Export("runesSprite") + static IndexedSprite[] runesSprite; + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "Lli;" ) @Export("titleboxSprite") static IndexedSprite titleboxSprite; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "Llm;" + signature = "Lli;" ) @Export("titlebuttonSprite") static IndexedSprite titlebuttonSprite; - @ObfuscatedName("w") - static int[][] field1207; - @ObfuscatedName("i") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "[Llm;" + signature = "Lli;" ) - @Export("title_muteSprite") - static IndexedSprite[] title_muteSprite; - @ObfuscatedName("x") + @Export("logoSprite") + static IndexedSprite logoSprite; + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Llm;" + signature = "Lex;" ) - static IndexedSprite field1179; - @ObfuscatedName("s") + @Export("World_request") + static UrlRequest World_request; + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "Lli;" + ) + @Export("options_buttons_2Sprite") + static IndexedSprite options_buttons_2Sprite; + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "Lli;" + ) + static IndexedSprite field1162; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -848328951 + intValue = -1796142123 ) @Export("loginBoxX") static int loginBoxX; - @ObfuscatedName("m") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 718703291 + intValue = 853386151 ) @Export("Login_loadingPercent") static int Login_loadingPercent; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("Login_loadingText") static String Login_loadingText; - @ObfuscatedName("ai") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 287436993 + intValue = 2047015599 ) - static int field1185; - @ObfuscatedName("aw") + static int field1167; + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = 1502422869 + intValue = -421620705 ) - static int field1186; + static int field1181; @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -748182157 + intValue = -996897081 ) @Export("loginIndex") static int loginIndex; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("Login_response0") static String Login_response0; - @ObfuscatedName("aq") + @ObfuscatedName("ay") @Export("Login_response1") static String Login_response1; - @ObfuscatedName("ac") + @ObfuscatedName("ag") @Export("Login_response2") static String Login_response2; - @ObfuscatedName("az") + @ObfuscatedName("ac") @Export("Login_response3") static String Login_response3; - @ObfuscatedName("at") + @ObfuscatedName("al") @Export("Login_username") static String Login_username; @ObfuscatedName("ae") @Export("Login_password") static String Login_password; - @ObfuscatedName("au") - static boolean field1173; - @ObfuscatedName("as") - static boolean field1195; - @ObfuscatedName("bo") - static boolean field1196; - @ObfuscatedName("bx") + @ObfuscatedName("ai") + static boolean field1186; + @ObfuscatedName("am") + static boolean field1182; + @ObfuscatedName("bg") + static boolean field1178; + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = 942896695 + intValue = -436671027 ) @Export("currentLoginField") static int currentLoginField; - @ObfuscatedName("bj") + @ObfuscatedName("bx") @Export("worldSelectOpen") static boolean worldSelectOpen; - @ObfuscatedName("bg") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = 417919885 + intValue = 1729150303 ) @Export("hoveredWorldIndex") static int hoveredWorldIndex; - @ObfuscatedName("bw") + @ObfuscatedName("bb") @ObfuscatedGetter( - intValue = -505554321 + intValue = 1430406405 ) @Export("worldSelectPage") static int worldSelectPage; - @ObfuscatedName("be") + @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = 1487083195 + intValue = 552421487 ) @Export("worldSelectPagesCount") static int worldSelectPagesCount; - @ObfuscatedName("bl") + @ObfuscatedName("bu") @ObfuscatedGetter( - longValue = -5043018622497011003L + longValue = 1507915071699624777L ) - static long field1205; - @ObfuscatedName("bp") + static long field1158; + @ObfuscatedName("be") @ObfuscatedGetter( - longValue = -8955113663343183185L + longValue = 8918979635006641127L ) - static long field1206; + static long field1187; + @ObfuscatedName("eh") + @Export("secureRandom") + static SecureRandom secureRandom; static { xPadding = 0; loginBoxX = xPadding + 202; Login_loadingPercent = 10; Login_loadingText = ""; - field1185 = -1; - field1186 = 1; + field1167 = -1; + field1181 = 1; loginIndex = 0; Login_response0 = ""; Login_response1 = ""; @@ -148,9 +168,9 @@ public class Login { Login_response3 = ""; Login_username = ""; Login_password = ""; - field1173 = false; - field1195 = false; - field1196 = true; + field1186 = false; + field1182 = false; + field1178 = true; currentLoginField = 0; worldSelectOpen = false; hoveredWorldIndex = -1; @@ -158,48 +178,16 @@ public class Login { worldSelectPagesCount = 0; new DecimalFormat("##0.00"); new class162(); - field1205 = -1L; - field1206 = -1L; + field1158 = -1L; + field1187 = -1L; } - @ObfuscatedName("b") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "84" + signature = "(II)Z", + garbageValue = "1893655286" ) - public static void method2125() { - try { - JagexCache.JagexCache_dat2File.close(); - - for (int var0 = 0; var0 < JagexCache.idxCount; ++var0) { - WorldMapSection1.JagexCache_idxFiles[var0].close(); - } - - JagexCache.JagexCache_idx255File.close(); - JagexCache.JagexCache_randomDat.close(); - } catch (Exception var2) { - } - - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "(Lkj;I)I", - garbageValue = "-1079578182" - ) - static int method2124(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 = var0.readBits(11); - } - - return var2; + public static boolean method2119(int var0) { + return (var0 >> 21 & 1) != 0; } } diff --git a/runescape-client/src/main/java/LoginPacket.java b/runescape-client/src/main/java/LoginPacket.java index 688f5e35ce..f73f3ac5f4 100644 --- a/runescape-client/src/main/java/LoginPacket.java +++ b/runescape-client/src/main/java/LoginPacket.java @@ -3,56 +3,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("gn") +@ObfuscatedName("fm") @Implements("LoginPacket") -public class LoginPacket implements class181 { - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final LoginPacket field2324; +public class LoginPacket implements class175 { @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lgn;" + signature = "Lfm;" ) - static final LoginPacket field2325; - @ObfuscatedName("b") + public static final LoginPacket field2282; + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lgn;" + signature = "Lfm;" ) - public static final LoginPacket field2326; - @ObfuscatedName("g") + static final LoginPacket field2288; + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lgn;" + signature = "Lfm;" ) - public static final LoginPacket field2328; - @ObfuscatedName("z") + public static final LoginPacket field2285; + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lgn;" + signature = "Lfm;" ) - static final LoginPacket field2327; - @ObfuscatedName("h") + public static final LoginPacket field2283; + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "[Lgn;" + signature = "Lfm;" + ) + static final LoginPacket field2284; + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "[Lfm;" ) @Export("LoginPacket_indexedValues") static final LoginPacket[] LoginPacket_indexedValues; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 213981161 + intValue = -1664908847 ) @Export("id") public final int id; static { - field2324 = new LoginPacket(14, 0); - field2325 = new LoginPacket(15, 4); - field2326 = new LoginPacket(16, -2); - field2328 = new LoginPacket(18, -2); - field2327 = new LoginPacket(27, 0); + field2282 = new LoginPacket(14, 0); + field2288 = new LoginPacket(15, 4); + field2285 = new LoginPacket(16, -2); + field2283 = new LoginPacket(18, -2); + field2284 = new LoginPacket(27, 0); LoginPacket_indexedValues = new LoginPacket[32]; - LoginPacket[] var0 = new LoginPacket[]{field2325, field2326, field2328, field2327, field2324}; + LoginPacket[] var0 = new LoginPacket[]{field2288, field2285, field2282, field2283, field2284}; LoginPacket[] var1 = var0; for (int var2 = 0; var2 < var1.length; ++var2) { @@ -69,127 +70,92 @@ public class LoginPacket implements class181 { this.id = var1; } - @ObfuscatedName("ie") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lih;IIII)V", - garbageValue = "2018798075" + signature = "(II)Lbs;", + garbageValue = "-2092272344" ) - @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 + GrandExchangeOfferWorldComparator.method77(var0.combatLevel, class215.localPlayer.combatLevel) + " " + " (" + "level-" + var0.combatLevel + ")"; - } - - if (var0.isFollower && Client.followerOpsLowPriority) { - WorldMapSprite.insertMenuItemNoShift("Examine", class222.colorStartTag(16776960) + var4, 1003, var1, var2, var3); - } - - if (Client.isItemSelected == 1) { - WorldMapSprite.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class222.colorStartTag(16776960) + var4, 7, var1, var2, var3); - } else if (Client.isSpellSelected) { - if ((Actor.selectedSpellFlags & 2) == 2) { - WorldMapSprite.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class222.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; - } - - WorldMapSprite.insertMenuItemNoShift(var6[var7], class222.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 (Client.npcAttackOption != AttackOption.AttackOption_hidden) { - if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > class215.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; - } - - WorldMapSprite.insertMenuItemNoShift(var6[var7], class222.colorStartTag(16776960) + var4, var8, var1, var2, var3); - } - } - } - } - - if (!var0.isFollower || !Client.followerOpsLowPriority) { - WorldMapSprite.insertMenuItemNoShift("Examine", class222.colorStartTag(16776960) + var4, 1003, var1, var2, var3); - } - } - - } - } + @Export("Messages_getMessage") + static Message Messages_getMessage(int var0) { + return (Message)Messages.Messages_hashTable.get((long)var0); + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "(ILcu;ZI)I", + garbageValue = "-1470208015" + ) + static int method3575(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { + var0 -= 1000; + var3 = Tile.getWidget(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); + } else { + var3 = var2 ? UserComparator7.field1946 : class197.field2398; + } + + if (var0 == ScriptOpcodes.CC_CALLONRESIZE) { + if (Interpreter.field1079 >= 10) { + throw new RuntimeException(); + } else if (var3.onResize == null) { + return 0; + } else { + ScriptEvent var4 = new ScriptEvent(); + var4.widget = var3; + var4.args = var3.onResize; + var4.field557 = Interpreter.field1079 + 1; + Client.scriptEvents.addFirst(var4); + return 1; } + } else { + return 2; } } - @ObfuscatedName("kv") + @ObfuscatedName("ht") @ObfuscatedSignature( - signature = "(Lhl;I)Ljava/lang/String;", - garbageValue = "646735317" + signature = "(B)V", + garbageValue = "5" ) - static String method3662(Widget var0) { - if (Client.method1655(MenuAction.getWidgetClickMask(var0)) == 0) { - return null; - } else { - return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; + static final void method3574() { + Client.field678 = 0; + int var0 = MusicPatchPcmStream.baseX * 64 + (Message.localPlayer.x >> 7); + int var1 = ScriptEvent.baseY * 64 + (Message.localPlayer.y >> 7); + if (var0 >= 3053 && var0 <= 3156 && var1 >= 3056 && var1 <= 3136) { + Client.field678 = 1; } + + if (var0 >= 3072 && var0 <= 3118 && var1 >= 9492 && var1 <= 9535) { + Client.field678 = 1; + } + + if (Client.field678 == 1 && var0 >= 3139 && var0 <= 3199 && var1 >= 3008 && var1 <= 3062) { + Client.field678 = 0; + } + + } + + @ObfuscatedName("ja") + @ObfuscatedSignature( + signature = "(IIIZB)V", + garbageValue = "58" + ) + static final void method3572(int var0, int var1, int var2, boolean var3) { + if (MusicPatch.loadInterface(var0)) { + FloorOverlayDefinition.resizeInterface(UserComparator7.Widget_interfaceComponents[var0], -1, var1, var2, var3); + } + } + + @ObfuscatedName("jj") + @ObfuscatedSignature( + signature = "(Lha;B)V", + garbageValue = "67" + ) + @Export("invalidateWidget") + static void invalidateWidget(Widget var0) { + if (var0.cycle == Client.field832) { + Client.field833[var0.rootIndex] = true; + } + } } diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java index 96a9310f63..46edc9bf4d 100644 --- a/runescape-client/src/main/java/LoginScreenAnimation.java +++ b/runescape-client/src/main/java/LoginScreenAnimation.java @@ -4,217 +4,208 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bv") +@ObfuscatedName("bd") @Implements("LoginScreenAnimation") public class LoginScreenAnimation { - @ObfuscatedName("qo") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Ldn;" - ) - @Export("decimator") - static Decimator decimator; - @ObfuscatedName("g") - @Export("Interpreter_stringLocals") - static String[] Interpreter_stringLocals; - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "[Llm;" + signature = "[Lli;" ) @Export("sprites") IndexedSprite[] sprites; - @ObfuscatedName("h") - int[] field1024; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = -522038553 - ) - int field1025; - @ObfuscatedName("w") - int[] field1026; - @ObfuscatedName("i") - int[] field1042; - @ObfuscatedName("k") - int[] field1028; - @ObfuscatedName("x") - int[] field1043; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 1610876241 - ) - int field1030; @ObfuscatedName("e") + int[] field1009; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 2082958971 + intValue = -225886709 ) - int field1031; - @ObfuscatedName("n") - int[] field1036; - @ObfuscatedName("r") - int[] field1033; - @ObfuscatedName("c") - int[] field1029; + int field1008; @ObfuscatedName("a") - int[] field1035; + int[] field1016; @ObfuscatedName("d") + int[] field1012; + @ObfuscatedName("c") + int[] field1013; + @ObfuscatedName("o") + int[] field1014; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -127865793 + intValue = 1086641703 ) - int field1020; + int field1005; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -937900497 + ) + int field1011; @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 256294268 - ) - int field1037; + int[] field1017; + @ObfuscatedName("l") + int[] field1018; @ObfuscatedName("t") + int[] field1019; + @ObfuscatedName("j") + int[] field1020; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 81915263 + intValue = 142712185 ) - int field1034; + int field1021; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 1690408336 + ) + int field1022; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -431156339 + ) + int field1023; @ObfuscatedSignature( - signature = "([Llm;)V" + signature = "([Lli;)V" ) LoginScreenAnimation(IndexedSprite[] var1) { - this.field1024 = new int[256]; - this.field1025 = 0; - this.field1030 = 0; - this.field1031 = 0; - this.field1020 = 0; - this.field1037 = 0; - this.field1034 = 0; + this.field1009 = new int[256]; + this.field1008 = 0; + this.field1005 = 0; + this.field1011 = 0; + this.field1021 = 0; + this.field1022 = 0; + this.field1023 = 0; this.sprites = var1; this.initColors(); } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1296235514" + garbageValue = "-309533051" ) @Export("initColors") void initColors() { - this.field1042 = new int[256]; + this.field1012 = new int[256]; int var1; for (var1 = 0; var1 < 64; ++var1) { - this.field1042[var1] = var1 * 262144; + this.field1012[var1] = var1 * 262144; } for (var1 = 0; var1 < 64; ++var1) { - this.field1042[var1 + 64] = var1 * 1024 + 16711680; + this.field1012[var1 + 64] = var1 * 1024 + 16711680; } for (var1 = 0; var1 < 64; ++var1) { - this.field1042[var1 + 128] = var1 * 4 + 16776960; + this.field1012[var1 + 128] = var1 * 4 + 16776960; } for (var1 = 0; var1 < 64; ++var1) { - this.field1042[var1 + 192] = 16777215; + this.field1012[var1 + 192] = 16777215; } - this.field1028 = new int[256]; + this.field1013 = new int[256]; for (var1 = 0; var1 < 64; ++var1) { - this.field1028[var1] = var1 * 1024; + this.field1013[var1] = var1 * 1024; } for (var1 = 0; var1 < 64; ++var1) { - this.field1028[var1 + 64] = var1 * 4 + 65280; + this.field1013[var1 + 64] = var1 * 4 + 65280; } for (var1 = 0; var1 < 64; ++var1) { - this.field1028[var1 + 128] = var1 * 262144 + 65535; + this.field1013[var1 + 128] = var1 * 262144 + 65535; } for (var1 = 0; var1 < 64; ++var1) { - this.field1028[var1 + 192] = 16777215; + this.field1013[var1 + 192] = 16777215; } - this.field1043 = new int[256]; + this.field1014 = new int[256]; for (var1 = 0; var1 < 64; ++var1) { - this.field1043[var1] = var1 * 4; + this.field1014[var1] = var1 * 4; } for (var1 = 0; var1 < 64; ++var1) { - this.field1043[var1 + 64] = var1 * 262144 + 255; + this.field1014[var1 + 64] = var1 * 262144 + 255; } for (var1 = 0; var1 < 64; ++var1) { - this.field1043[var1 + 128] = var1 * 1024 + 16711935; + this.field1014[var1 + 128] = var1 * 1024 + 16711935; } for (var1 = 0; var1 < 64; ++var1) { - this.field1043[var1 + 192] = 16777215; + this.field1014[var1 + 192] = 16777215; } - this.field1026 = new int[256]; - this.field1020 = 0; - this.field1029 = new int[32768]; - this.field1035 = new int[32768]; - this.method1834((IndexedSprite)null); - this.field1036 = new int[32768]; - this.field1033 = new int[32768]; + this.field1016 = new int[256]; + this.field1021 = 0; + this.field1019 = new int[32768]; + this.field1020 = new int[32768]; + this.method1824((IndexedSprite)null); + this.field1017 = new int[32768]; + this.field1018 = new int[32768]; } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "9" + signature = "(I)V", + garbageValue = "140208699" ) - void method1828() { - this.field1042 = null; - this.field1028 = null; - this.field1043 = null; - this.field1026 = null; - this.field1029 = null; - this.field1035 = null; - this.field1036 = null; - this.field1033 = null; - this.field1020 = 0; - this.field1037 = 0; + void method1812() { + this.field1012 = null; + this.field1013 = null; + this.field1014 = null; + this.field1016 = null; + this.field1019 = null; + this.field1020 = null; + this.field1017 = null; + this.field1018 = null; + this.field1021 = 0; + this.field1022 = 0; } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "2116799811" + garbageValue = "-211420525" ) @Export("draw") void draw(int var1, int var2) { - if (this.field1036 == null) { + if (this.field1017 == null) { this.initColors(); } - if (this.field1034 == 0) { - this.field1034 = var2; + if (this.field1023 == 0) { + this.field1023 = var2; } - int var3 = var2 - this.field1034; + int var3 = var2 - this.field1023; if (var3 >= 256) { var3 = 0; } - this.field1034 = var2; + this.field1023 = var2; if (var3 > 0) { - this.method1830(var3); + this.method1807(var3); } - this.method1839(var1); + this.method1809(var1); } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1116780854" + signature = "(IB)V", + garbageValue = "0" ) - final void method1830(int var1) { - this.field1020 += 128 * var1; + final void method1807(int var1) { + this.field1021 += 128 * var1; int var2; - if (this.field1020 > this.field1029.length) { - this.field1020 -= this.field1029.length; + if (this.field1021 > this.field1019.length) { + this.field1021 -= this.field1019.length; var2 = (int)(Math.random() * 12.0D); - this.method1834(this.sprites[var2]); + this.method1824(this.sprites[var2]); } var2 = 0; @@ -223,12 +214,12 @@ public class LoginScreenAnimation { int var6; for (int var5 = 0; var5 < var4; ++var5) { - var6 = this.field1036[var3 + var2] - this.field1029[var2 + this.field1020 & this.field1029.length - 1] * var1 / 6; + var6 = this.field1017[var3 + var2] - this.field1019[var2 + this.field1021 & this.field1019.length - 1] * var1 / 6; if (var6 < 0) { var6 = 0; } - this.field1036[var2++] = var6; + this.field1017[var2++] = var6; } byte var15 = 10; @@ -242,42 +233,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.field1036[var8 + var9] = 255; + this.field1017[var8 + var9] = 255; } else { - this.field1036[var8 + var9] = 0; + this.field1017[var9 + var8] = 0; } } } - if (this.field1030 * 16 > 0) { - this.field1030 = this.field1030 * 16 - var1 * 4; + if (this.field1005 * 16 > 0) { + this.field1005 = this.field1005 * 16 - var1 * 4; } - if (this.field1031 * 16 > 0) { - this.field1031 = this.field1031 * 16 - var1 * 4; + if (this.field1011 * 16 > 0) { + this.field1011 = this.field1011 * 16 - var1 * 4; } - if (this.field1030 * 16 == 0 && this.field1031 * 16 == 0) { + if (this.field1005 * 16 == 0 && this.field1011 * 16 == 0) { var7 = (int)(Math.random() * (double)(2000 / var1)); if (var7 == 0) { - this.field1030 = 1024; + this.field1005 = 1024; } if (var7 == 1) { - this.field1031 = 1024; + this.field1011 = 1024; } } for (var7 = 0; var7 < 256 - var1; ++var7) { - this.field1024[var7] = this.field1024[var7 + var1]; + this.field1009[var7] = this.field1009[var7 + var1]; } for (var7 = 256 - var1; var7 < 256; ++var7) { - this.field1024[var7] = (int)(Math.sin((double)this.field1025 / 14.0D) * 16.0D + Math.sin((double)this.field1025 / 15.0D) * 14.0D + Math.sin((double)this.field1025 / 16.0D) * 12.0D); - ++this.field1025; + this.field1009[var7] = (int)(Math.sin((double)this.field1008 / 14.0D) * 16.0D + Math.sin((double)this.field1008 / 15.0D) * 14.0D + Math.sin((double)this.field1008 / 16.0D) * 12.0D); + ++this.field1008; } - this.field1037 = this.field1037 * 10000 + var1 * 100; + this.field1022 = this.field1022 * 10000 + var1 * 10000; var7 = ((Client.cycle & 1) + var1) / 2; if (var7 > 0) { short var16 = 128; @@ -287,13 +278,13 @@ public class LoginScreenAnimation { int var11; int var12; int var13; - for (var11 = 0; var11 < this.field1037 * 10000; ++var11) { + for (var11 = 0; var11 < this.field1022 * 100; ++var11) { var12 = (int)(Math.random() * (double)var10) + var17; var13 = (int)(Math.random() * (double)var16) + var16; - this.field1036[var12 + (var13 << 7)] = 192; + this.field1017[var12 + (var13 << 7)] = 192; } - this.field1037 = 0; + this.field1022 = 0; int var14; for (var11 = 0; var11 < 256; ++var11) { @@ -301,16 +292,16 @@ public class LoginScreenAnimation { var13 = var11 * 128; for (var14 = -var7; var14 < 128; ++var14) { - if (var7 + var14 < 128) { - var12 += this.field1036[var14 + var13 + var7]; + if (var14 + var7 < 128) { + var12 += this.field1017[var13 + var14 + var7]; } if (var14 - (var7 + 1) >= 0) { - var12 -= this.field1036[var13 + var14 - (var7 + 1)]; + var12 -= this.field1017[var13 + var14 - (var7 + 1)]; } if (var14 >= 0) { - this.field1033[var13 + var14] = var12 / (var7 * 2 + 1); + this.field1018[var13 + var14] = var12 / (var7 * 2 + 1); } } } @@ -321,15 +312,15 @@ public class LoginScreenAnimation { for (var13 = -var7; var13 < 256; ++var13) { var14 = var13 * 128; if (var13 + var7 < 256) { - var12 += this.field1033[var7 * 128 + var14 + var11]; + var12 += this.field1018[var14 + var11 + var7 * 128]; } if (var13 - (var7 + 1) >= 0) { - var12 -= this.field1033[var14 + var11 - (var7 + 1) * 128]; + var12 -= this.field1018[var14 + var11 - (var7 + 1) * 128]; } if (var13 >= 0) { - this.field1036[var11 + var14] = var12 / (var7 * 2 + 1); + this.field1017[var11 + var14] = var12 / (var7 * 2 + 1); } } } @@ -337,66 +328,66 @@ public class LoginScreenAnimation { } - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "(IIII)I", - garbageValue = "-2144632316" - ) - final int method1831(int var1, int var2, int var3) { - int var4 = 256 - var3; - return (var3 * (var2 & 65280) + var4 * (var1 & 65280) & 16711680) + (var3 * (var2 & 16711935) + var4 * (var1 & 16711935) & -16711936) >> 8; - } - @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1401250939" + signature = "(IIII)I", + garbageValue = "2136023093" ) - final void method1839(int var1) { - int var2 = this.field1026.length; - if (this.field1030 * 16 > 0) { - this.method1844(this.field1030 * 16, this.field1028); - } else if (this.field1031 * 16 > 0) { - this.method1844(this.field1031 * 16, this.field1043); + final int method1808(int var1, int var2, int var3) { + int var4 = 256 - var3; + return (var3 * (var2 & 65280) + var4 * (var1 & 65280) & 16711680) + (var4 * (var1 & 16711935) + var3 * (var2 & 16711935) & -16711936) >> 8; + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "-1234876855" + ) + final void method1809(int var1) { + int var2 = this.field1016.length; + if (this.field1005 * 16 > 0) { + this.method1810(this.field1005 * 16, this.field1013); + } else if (this.field1011 * 16 > 0) { + this.method1810(this.field1011 * 16, this.field1014); } else { for (int var3 = 0; var3 < var2; ++var3) { - this.field1026[var3] = this.field1042[var3]; + this.field1016[var3] = this.field1012[var3]; } } - this.method1833(var1); + this.method1811(var1); } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(I[IS)V", - garbageValue = "732" + signature = "(I[IB)V", + garbageValue = "3" ) - final void method1844(int var1, int[] var2) { - int var3 = this.field1026.length; + final void method1810(int var1, int[] var2) { + int var3 = this.field1016.length; for (int var4 = 0; var4 < var3; ++var4) { if (var1 > 768) { - this.field1026[var4] = this.method1831(this.field1042[var4], var2[var4], 1024 - var1); + this.field1016[var4] = this.method1808(this.field1012[var4], var2[var4], 1024 - var1); } else if (var1 > 256) { - this.field1026[var4] = var2[var4]; + this.field1016[var4] = var2[var4]; } else { - this.field1026[var4] = this.method1831(var2[var4], this.field1042[var4], 256 - var1); + this.field1016[var4] = this.method1808(var2[var4], this.field1012[var4], 256 - var1); } } } - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-1303353921" + garbageValue = "1586915597" ) - final void method1833(int var1) { + final void method1811(int var1) { int var2 = 0; for (int var3 = 1; var3 < 255; ++var3) { - int var4 = (256 - var3) * this.field1024[var3] / 256; + int var4 = (256 - var3) * this.field1009[var3] / 256; int var5 = var4 + var1; int var6 = 0; int var7 = 128; @@ -405,22 +396,22 @@ public class LoginScreenAnimation { var5 = 0; } - if (var5 + 128 >= DirectByteArrayCopier.rasterProvider.width) { - var7 = DirectByteArrayCopier.rasterProvider.width - var5; + if (var5 + 128 >= IgnoreList.rasterProvider.width) { + var7 = IgnoreList.rasterProvider.width - var5; } - int var8 = var5 + (var3 + 8) * DirectByteArrayCopier.rasterProvider.width; + int var8 = var5 + (var3 + 8) * IgnoreList.rasterProvider.width; var2 += var6; for (int var9 = var6; var9 < var7; ++var9) { - int var10 = this.field1036[var2++]; + int var10 = this.field1017[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.field1026[var10]; - int var14 = DirectByteArrayCopier.rasterProvider.pixels[var8]; - DirectByteArrayCopier.rasterProvider.pixels[var8++] = -16777216 | (var12 * (var10 & 65280) + var13 * (var14 & 65280) & 16711680) + ((var10 & 16711935) * var12 + (var14 & 16711935) * var13 & -16711936) >> 8; + var10 = this.field1016[var10]; + int var14 = IgnoreList.rasterProvider.pixels[var8]; + IgnoreList.rasterProvider.pixels[var8++] = -16777216 | (var13 * (var14 & 65280) + var12 * (var10 & 65280) & 16711680) + ((var14 & 16711935) * var13 + (var10 & 16711935) * var12 & -16711936) >> 8; } else { ++var8; } @@ -431,21 +422,21 @@ public class LoginScreenAnimation { } - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(Llm;I)V", - garbageValue = "545275077" + signature = "(Lli;I)V", + garbageValue = "-1419079809" ) - final void method1834(IndexedSprite var1) { + final void method1824(IndexedSprite var1) { int var2; - for (var2 = 0; var2 < this.field1029.length; ++var2) { - this.field1029[var2] = 0; + for (var2 = 0; var2 < this.field1019.length; ++var2) { + this.field1019[var2] = 0; } int var3; for (var2 = 0; var2 < 5000; ++var2) { var3 = (int)(Math.random() * 128.0D * 256.0D); - this.field1029[var3] = (int)(Math.random() * 256.0D); + this.field1019[var3] = (int)(Math.random() * 256.0D); } int var4; @@ -454,13 +445,13 @@ public class LoginScreenAnimation { for (var3 = 1; var3 < 255; ++var3) { for (var4 = 1; var4 < 127; ++var4) { var5 = var4 + (var3 << 7); - this.field1035[var5] = (this.field1029[var5 + 128] + this.field1029[var5 - 128] + this.field1029[var5 + 1] + this.field1029[var5 - 1]) / 4; + this.field1020[var5] = (this.field1019[var5 - 128] + this.field1019[var5 + 1] + this.field1019[var5 + 128] + this.field1019[var5 - 1]) / 4; } } - int[] var8 = this.field1029; - this.field1029 = this.field1035; - this.field1035 = var8; + int[] var8 = this.field1019; + this.field1019 = this.field1020; + this.field1020 = var8; } if (var1 != null) { @@ -472,7 +463,7 @@ public class LoginScreenAnimation { var5 = var4 + var1.xOffset + 16; int var6 = var3 + var1.yOffset + 16; int var7 = var5 + (var6 << 7); - this.field1029[var7] = 0; + this.field1019[var7] = 0; } } } @@ -480,31 +471,27 @@ public class LoginScreenAnimation { } - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "925097007" + signature = "(I)[Lfi;", + garbageValue = "-1862845897" ) - static final int method1832(int var0, int var1) { - if (var0 == -2) { - return 12345678; - } else if (var0 == -1) { - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } + public static class179[] method1832() { + return new class179[]{class179.field2291, class179.field2290, class179.field2292, class179.field2289, class179.field2293, class179.field2294, class179.field2295, class179.field2296, class179.field2297, class179.field2298}; + } - return var1; - } else { - var1 = (var0 & 127) * var1 / 128; - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "1841438031" + ) + static void method1831() { + Players.Players_count = 0; - return (var0 & 65408) + var1; + for (int var0 = 0; var0 < 2048; ++var0) { + Players.field1228[var0] = null; + Players.field1231[var0] = 1; } + } } diff --git a/runescape-client/src/main/java/LoginType.java b/runescape-client/src/main/java/LoginType.java index 489faa2172..125f33c18b 100644 --- a/runescape-client/src/main/java/LoginType.java +++ b/runescape-client/src/main/java/LoginType.java @@ -4,85 +4,91 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lg") +@ObfuscatedName("ll") @Implements("LoginType") public class LoginType { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Llg;" + signature = "Lll;" ) @Export("oldscape") public static final LoginType oldscape; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Llg;" + signature = "Lll;" ) - static final LoginType field4024; - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "Llg;" - ) - static final LoginType field4025; - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "Llg;" - ) - static final LoginType field4026; - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "Llg;" - ) - static final LoginType field4027; - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Llg;" - ) - static final LoginType field4028; - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "Llg;" - ) - static final LoginType field4029; + static final LoginType field4023; @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Llg;" + signature = "Lll;" ) - static final LoginType field4030; + static final LoginType field4025; @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Llg;" + signature = "Lll;" + ) + static final LoginType field4026; + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "Lll;" + ) + static final LoginType field4028; + @ObfuscatedName("b") + @ObfuscatedSignature( + signature = "Lll;" + ) + static final LoginType field4024; + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "Lll;" + ) + static final LoginType field4027; + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "Lll;" + ) + static final LoginType field4030; + @ObfuscatedName("a") + @ObfuscatedSignature( + signature = "Lll;" ) public static final LoginType field4031; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 1453765621 + @ObfuscatedName("lb") + @ObfuscatedSignature( + signature = "Lcq;" ) - final int field4032; - @ObfuscatedName("k") + @Export("tempMenuAction") + static MenuAction tempMenuAction; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -1388330399 + ) + public final int field4029; + @ObfuscatedName("c") final String field4033; static { - oldscape = new LoginType(5, 0, "", ""); - field4024 = new LoginType(1, 1, "", ""); - field4025 = new LoginType(7, 2, "", ""); - field4026 = new LoginType(0, 3, "", ""); - field4027 = new LoginType(4, 4, "", ""); - field4028 = new LoginType(6, 5, "", ""); - field4029 = new LoginType(3, 6, "", ""); - field4030 = new LoginType(2, 7, "", ""); - field4031 = new LoginType(8, -1, "", "", true, new LoginType[]{oldscape, field4024, field4025, field4027, field4026}); + oldscape = new LoginType(6, 0, "", ""); + field4023 = new LoginType(2, 1, "", ""); + field4025 = new LoginType(3, 2, "", ""); + field4026 = new LoginType(8, 3, "", ""); + field4028 = new LoginType(1, 4, "", ""); + field4024 = new LoginType(4, 5, "", ""); + field4027 = new LoginType(5, 6, "", ""); + field4030 = new LoginType(0, 7, "", ""); + field4031 = new LoginType(7, -1, "", "", true, new LoginType[]{oldscape, field4023, field4025, field4028, field4026}); } LoginType(int var1, int var2, String var3, String var4) { - this.field4032 = var1; + this.field4029 = var1; this.field4033 = var4; } @ObfuscatedSignature( - signature = "(IILjava/lang/String;Ljava/lang/String;Z[Llg;)V" + signature = "(IILjava/lang/String;Ljava/lang/String;Z[Lll;)V" ) LoginType(int var1, int var2, String var3, String var4, boolean var5, LoginType[] var6) { - this.field4032 = var1; + this.field4029 = var1; this.field4033 = var4; } diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java index 59d3bddcaf..0a9ac68ec9 100644 --- a/runescape-client/src/main/java/MenuAction.java +++ b/runescape-client/src/main/java/MenuAction.java @@ -1,284 +1,445 @@ +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("cg") +@ObfuscatedName("cq") @Implements("MenuAction") public class MenuAction { - @ObfuscatedName("qp") - @ObfuscatedSignature( - signature = "Lde;" - ) - @Export("pcmPlayer0") - static PcmPlayer pcmPlayer0; - @ObfuscatedName("u") + @ObfuscatedName("c") + @Export("Tiles_saturation") + static int[] Tiles_saturation; + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 727455553 + intValue = 1017693045 + ) + static int field1133; + @ObfuscatedName("fv") + @ObfuscatedSignature( + signature = "Lfu;" + ) + @Export("socketTask") + static Task socketTask; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 1602431119 ) @Export("param0") int param0; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -2069898041 + intValue = 2095911709 ) @Export("param1") int param1; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -444090723 + intValue = -1872419161 ) @Export("opcode") int opcode; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1960849141 + intValue = -445186717 ) @Export("identifier") int identifier; - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("action") String action; MenuAction() { } - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(IIIIIIILel;Lfh;I)V", - garbageValue = "-285019446" + signature = "(I)[B", + garbageValue = "-369177149" ) - static final void method2088(int var0, int var1, int var2, int var3, int var4, int var5, int var6, Scene var7, CollisionMap var8) { - ObjectDefinition var9 = Occluder.getObjectDefinition(var4); - int var10; - int var11; - if (var5 != 1 && var5 != 3) { - var10 = var9.sizeX; - var11 = var9.sizeY; - } else { - var10 = var9.sizeY; - var11 = var9.sizeX; + public static byte[] method2068() { + byte[] var0 = new byte[24]; + + try { + JagexCache.JagexCache_randomDat.seek(0L); + JagexCache.JagexCache_randomDat.readFully(var0); + + int var1; + for (var1 = 0; var1 < 24 && var0[var1] == 0; ++var1) { + } + + if (var1 >= 24) { + throw new IOException(); + } + } catch (Exception var4) { + for (int var2 = 0; var2 < 24; ++var2) { + var0[var2] = -1; + } } - 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][var14] + var16[var12][var14] + var16[var12][var15] + var16[var13][var15] >> 2; - int var18 = (var2 << 7) + (var10 << 6); - int var19 = (var3 << 7) + (var11 << 6); - long var20 = MouseHandler.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.method3242(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.field505[var5], 0, var20, var22); - if (var9.interactType != 0) { - var8.method3614(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.field506[var5], 0, var20, var22); - if (var9.interactType != 0) { - var8.method3614(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.field505[var5], Tiles.field505[var29], var20, var22); - if (var9.interactType != 0) { - var8.method3614(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.field506[var5], 0, var20, var22); - if (var9.interactType != 0) { - var8.method3614(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.method3242(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.field505[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 = Occluder.getObjectDefinition(ItemContainer.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.field505[var5], 0, var29 * Tiles.field507[var5], var29 * Tiles.field508[var5], var20, var22); - } else if (var6 == 6) { - var29 = 8; - var30 = var7.getBoundaryObjectTag(var0, var2, var3); - if (var30 != 0L) { - var29 = Occluder.getObjectDefinition(ItemContainer.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.field509[var5], var29 * Tiles.field513[var5], var20, var22); - } else if (var6 == 7) { - int var32 = var5 + 2 & 3; - if (var9.animationId == -1 && var9.transforms == null) { - var23 = var9.getModel(4, var32 + 4, var16, var18, var17, var19); - } else { - var23 = new DynamicObject(var4, 4, var32 + 4, var1, var2, var3, var9.animationId, true, (Entity)null); - } - - var7.newWallDecoration(var0, var2, var3, var17, (Entity)var23, (Entity)null, 256, var32, 0, 0, var20, var22); - } else if (var6 == 8) { - var29 = 8; - var30 = var7.getBoundaryObjectTag(var0, var2, var3); - if (var30 != 0L) { - var29 = Occluder.getObjectDefinition(ItemContainer.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.field509[var5], var29 * Tiles.field513[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.method3242(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 var0; } - @ObfuscatedName("kj") + @ObfuscatedName("au") @ObfuscatedSignature( - signature = "(Lhl;I)I", - garbageValue = "1738654029" + signature = "(ILcu;ZI)I", + garbageValue = "-1293771000" ) - @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 method2069(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.FRIEND_COUNT) { + if (Message.friendSystem.field1045 == 0) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -2; + } else if (Message.friendSystem.field1045 == 1) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Message.friendSystem.friendsList.getSize(); + } + + return 1; + } else { + int var3; + if (var0 == ScriptOpcodes.FRIEND_GETNAME) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + if (Message.friendSystem.method1844() && var3 >= 0 && var3 < Message.friendSystem.friendsList.getSize()) { + Friend var8 = (Friend)Message.friendSystem.friendsList.get(var3); + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var8.getName(); + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var8.getPreviousName(); + } else { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + if (Message.friendSystem.method1844() && var3 >= 0 && var3 < Message.friendSystem.friendsList.getSize()) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = ((Buddy)Message.friendSystem.friendsList.get(var3)).world; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + if (Message.friendSystem.method1844() && var3 >= 0 && var3 < Message.friendSystem.friendsList.getSize()) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = ((Buddy)Message.friendSystem.friendsList.get(var3)).rank; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else { + String var5; + if (var0 == ScriptOpcodes.FRIEND_SETRANK) { + var5 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + int var6 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + BoundaryObject.method3274(var5, var6); + return 1; + } else if (var0 == ScriptOpcodes.FRIEND_ADD) { + var5 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + Message.friendSystem.addFriend(var5); + return 1; + } else if (var0 == ScriptOpcodes.FRIEND_DEL) { + var5 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + Message.friendSystem.removeFriend(var5); + return 1; + } else if (var0 == ScriptOpcodes.IGNORE_ADD) { + var5 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + Message.friendSystem.addIgnore(var5); + return 1; + } else if (var0 == ScriptOpcodes.IGNORE_DEL) { + var5 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + Message.friendSystem.removeIgnore(var5); + return 1; + } else if (var0 == ScriptOpcodes.FRIEND_TEST) { + var5 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + var5 = WorldMapManager.method662(var5); + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Message.friendSystem.isFriended(new Username(var5, class188.loginType), false) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { + if (Calendar.clanChat != null) { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = Calendar.clanChat.name; + } else { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { + if (Calendar.clanChat != null) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Calendar.clanChat.getSize(); + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + if (Calendar.clanChat != null && var3 < Calendar.clanChat.getSize()) { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = Calendar.clanChat.get(var3).getUsername().getName(); + } else { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + if (Calendar.clanChat != null && var3 < Calendar.clanChat.getSize()) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = ((Buddy)Calendar.clanChat.get(var3)).getWorld(); + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + if (Calendar.clanChat != null && var3 < Calendar.clanChat.getSize()) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = ((Buddy)Calendar.clanChat.get(var3)).rank; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Calendar.clanChat != null ? Calendar.clanChat.minKick : 0; + return 1; + } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { + var5 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + WorldMapIcon_1.clanKickUser(var5); + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Calendar.clanChat != null ? Calendar.clanChat.rank : 0; + return 1; + } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { + var5 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + WorldMapSection2.Clan_joinChat(var5); + return 1; + } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { + class3.Clan_leaveChat(); + return 1; + } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { + if (!Message.friendSystem.method1844()) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Message.friendSystem.ignoreList.getSize(); + } + + return 1; + } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + if (Message.friendSystem.method1844() && var3 >= 0 && var3 < Message.friendSystem.ignoreList.getSize()) { + Ignored var4 = (Ignored)Message.friendSystem.ignoreList.get(var3); + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var4.getName(); + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var4.getPreviousName(); + } else { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.IGNORE_TEST) { + var5 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + var5 = WorldMapManager.method662(var5); + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Message.friendSystem.isIgnored(new Username(var5, class188.loginType)) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + if (Calendar.clanChat != null && var3 < Calendar.clanChat.getSize() && Calendar.clanChat.get(var3).getUsername().equals(Message.localPlayer.username)) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { + if (Calendar.clanChat != null && Calendar.clanChat.owner != null) { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = Calendar.clanChat.owner; + } else { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + if (Calendar.clanChat != null && var3 < Calendar.clanChat.getSize() && ((ClanMate)Calendar.clanChat.get(var3)).isFriend()) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) { + if (var0 == 3628) { + Message.friendSystem.friendsList.removeComparator(); + return 1; + } else { + boolean var7; + if (var0 == 3629) { + var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + Message.friendSystem.friendsList.addComparator(new UserComparator1(var7)); + return 1; + } else if (var0 == 3630) { + var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + Message.friendSystem.friendsList.addComparator(new UserComparator2(var7)); + return 1; + } else if (var0 == 3631) { + var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + Message.friendSystem.friendsList.addComparator(new UserComparator3(var7)); + return 1; + } else if (var0 == 3632) { + var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + Message.friendSystem.friendsList.addComparator(new UserComparator4(var7)); + return 1; + } else if (var0 == 3633) { + var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + Message.friendSystem.friendsList.addComparator(new UserComparator5(var7)); + return 1; + } else if (var0 == 3634) { + var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + Message.friendSystem.friendsList.addComparator(new UserComparator6(var7)); + return 1; + } else if (var0 == 3635) { + var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + Message.friendSystem.friendsList.addComparator(new UserComparator7(var7)); + return 1; + } else if (var0 == 3636) { + var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + Message.friendSystem.friendsList.addComparator(new UserComparator8(var7)); + return 1; + } else if (var0 == 3637) { + var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + Message.friendSystem.friendsList.addComparator(new UserComparator9(var7)); + return 1; + } else if (var0 == 3638) { + var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + Message.friendSystem.friendsList.addComparator(new UserComparator10(var7)); + return 1; + } else if (var0 == 3639) { + Message.friendSystem.friendsList.sort(); + return 1; + } else if (var0 == 3640) { + Message.friendSystem.ignoreList.removeComparator(); + return 1; + } else if (var0 == 3641) { + var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + Message.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); + return 1; + } else if (var0 == 3642) { + var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + Message.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); + return 1; + } else if (var0 == 3643) { + Message.friendSystem.ignoreList.sort(); + return 1; + } else if (var0 == 3644) { + if (Calendar.clanChat != null) { + Calendar.clanChat.removeComparator(); + } + + return 1; + } else if (var0 == 3645) { + var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + if (Calendar.clanChat != null) { + Calendar.clanChat.addComparator(new UserComparator1(var7)); + } + + return 1; + } else if (var0 == 3646) { + var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + if (Calendar.clanChat != null) { + Calendar.clanChat.addComparator(new UserComparator2(var7)); + } + + return 1; + } else if (var0 == 3647) { + var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + if (Calendar.clanChat != null) { + Calendar.clanChat.addComparator(new UserComparator3(var7)); + } + + return 1; + } else if (var0 == 3648) { + var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + if (Calendar.clanChat != null) { + Calendar.clanChat.addComparator(new UserComparator4(var7)); + } + + return 1; + } else if (var0 == 3649) { + var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + if (Calendar.clanChat != null) { + Calendar.clanChat.addComparator(new UserComparator5(var7)); + } + + return 1; + } else if (var0 == 3650) { + var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + if (Calendar.clanChat != null) { + Calendar.clanChat.addComparator(new UserComparator6(var7)); + } + + return 1; + } else if (var0 == 3651) { + var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + if (Calendar.clanChat != null) { + Calendar.clanChat.addComparator(new UserComparator7(var7)); + } + + return 1; + } else if (var0 == 3652) { + var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + if (Calendar.clanChat != null) { + Calendar.clanChat.addComparator(new UserComparator8(var7)); + } + + return 1; + } else if (var0 == 3653) { + var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + if (Calendar.clanChat != null) { + Calendar.clanChat.addComparator(new UserComparator9(var7)); + } + + return 1; + } else if (var0 == 3654) { + var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + if (Calendar.clanChat != null) { + Calendar.clanChat.addComparator(new UserComparator10(var7)); + } + + return 1; + } else if (var0 == 3655) { + if (Calendar.clanChat != null) { + Calendar.clanChat.sort(); + } + + return 1; + } else if (var0 == 3656) { + var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + Message.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); + return 1; + } else if (var0 == 3657) { + var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + if (Calendar.clanChat != null) { + Calendar.clanChat.addComparator(new BuddyRankComparator(var7)); + } + + return 1; + } else { + return 2; + } + } + } else { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + if (Calendar.clanChat != null && var3 < Calendar.clanChat.getSize() && ((ClanMate)Calendar.clanChat.get(var3)).isIgnored()) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } + } + } } } diff --git a/runescape-client/src/main/java/Message.java b/runescape-client/src/main/java/Message.java index 33b267c7bf..1c3a54306b 100644 --- a/runescape-client/src/main/java/Message.java +++ b/runescape-client/src/main/java/Message.java @@ -1,55 +1,75 @@ +import java.io.File; +import java.io.RandomAccessFile; 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("ba") +@ObfuscatedName("bs") @Implements("Message") public class Message extends DualNode { - @ObfuscatedName("u") + @ObfuscatedName("rp") + @ObfuscatedSignature( + signature = "Lbi;" + ) + @Export("friendSystem") + public static FriendSystem friendSystem; + @ObfuscatedName("bz") + @ObfuscatedSignature( + signature = "[Lli;" + ) + @Export("worldSelectArrows") + static IndexedSprite[] worldSelectArrows; + @ObfuscatedName("jg") + @ObfuscatedSignature( + signature = "Lbn;" + ) + @Export("localPlayer") + static Player localPlayer; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1109124741 + intValue = 2145696747 ) @Export("count") int count; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1203211479 + intValue = -1217348159 ) @Export("cycle") int cycle; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1935064875 + intValue = 1995619175 ) @Export("type") int type; - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("sender") String sender; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Ljb;" + signature = "Ljc;" ) @Export("senderUsername") Username senderUsername; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "Lja;" + signature = "Ljf;" ) @Export("isFromFriend0") TriBool isFromFriend0; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lja;" + signature = "Ljf;" ) @Export("isFromIgnored0") TriBool isFromIgnored0; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("prefix") String prefix; - @ObfuscatedName("w") + @ObfuscatedName("a") @Export("text") String text; @@ -59,14 +79,15 @@ public class Message extends DualNode { this.set(var1, var2, var3, var4); } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "1827197731" + garbageValue = "-220493658" ) @Export("set") void set(int var1, String var2, String var3, String var4) { - this.count = TileItem.method2142(); + int var5 = ++Messages.Messages_count - 1; + this.count = var5; this.cycle = Client.cycle; this.type = var1; this.sender = var2; @@ -77,20 +98,20 @@ public class Message extends DualNode { this.clearIsFromIgnored(); } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-565259576" + garbageValue = "-1286059763" ) @Export("clearIsFromFriend") void clearIsFromFriend() { this.isFromFriend0 = TriBool.TriBool_unknown; } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-285390523" + garbageValue = "-2036111403" ) @Export("isFromFriend") final boolean isFromFriend() { @@ -101,30 +122,30 @@ public class Message extends DualNode { return this.isFromFriend0 == TriBool.TriBool_true; } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-28" + signature = "(I)V", + garbageValue = "-928158145" ) @Export("fillIsFromFriend") void fillIsFromFriend() { - this.isFromFriend0 = VertexNormal.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isFromFriend0 = friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1848382853" + garbageValue = "450069868" ) @Export("clearIsFromIgnored") void clearIsFromIgnored() { this.isFromIgnored0 = TriBool.TriBool_unknown; } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "1891538421" + garbageValue = "-1235036606" ) @Export("isFromIgnored") final boolean isFromIgnored() { @@ -135,74 +156,395 @@ public class Message extends DualNode { return this.isFromIgnored0 == TriBool.TriBool_true; } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1953664490" + signature = "(B)V", + garbageValue = "80" ) @Export("fillIsFromIgnored") void fillIsFromIgnored() { - this.isFromIgnored0 = VertexNormal.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isFromIgnored0 = friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-324543817" + garbageValue = "1271622880" ) @Export("fillSenderUsername") final void fillSenderUsername() { if (this.sender != null) { - this.senderUsername = new Username(VertexNormal.method3017(this.sender), WorldMapLabelSize.loginType); + this.senderUsername = new Username(WorldMapManager.method662(this.sender), class188.loginType); } else { this.senderUsername = null; } } - @ObfuscatedName("kn") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Ljava/lang/String;ZI)V", - garbageValue = "432259312" + signature = "(Ljava/lang/String;B)Ljava/io/File;", + garbageValue = "25" ) - @Export("findItemDefinitions") - static void findItemDefinitions(String var0, boolean var1) { - var0 = var0.toLowerCase(); - short[] var2 = new short[16]; - int var3 = 0; + @Export("getFile") + static File getFile(String var0) { + if (!FileSystem.FileSystem_hasPermissions) { + throw new RuntimeException(""); + } else { + File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); + if (var1 != null) { + return var1; + } else { + File var2 = new File(GrandExchangeOfferNameComparator.FileSystem_cacheDir, var0); + RandomAccessFile var3 = null; - for (int var4 = 0; var4 < class81.ItemDefinition_fileCount; ++var4) { - ItemDefinition var5 = Interpreter.ItemDefinition_get(var4); - if ((!var1 || var5.isTradable) && var5.noteTemplate == -1 && var5.name.toLowerCase().indexOf(var0) != -1) { - if (var3 >= 250) { - UserComparator10.foundItemIdCount = -1; - MusicPatch.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]; + 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) { } - var2 = var6; + throw new RuntimeException(); } + } + } + } - var2[var3++] = (short)var4; + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "1512311180" + ) + public static void method1223() { + class325.SpriteBuffer_xOffsets = null; + class325.SpriteBuffer_yOffsets = null; + UserComparator1.SpriteBuffer_spriteWidths = null; + class325.SpriteBuffer_spriteHeights = null; + class268.SpriteBuffer_spritePalette = null; + class290.SpriteBuffer_pixels = null; + } + + @ObfuscatedName("fw") + @ObfuscatedSignature( + signature = "(Liv;IIII)V", + garbageValue = "-860249391" + ) + @Export("addSequenceSoundEffect") + static void addSequenceSoundEffect(SequenceDefinition var0, int var1, int var2, int var3) { + if (Client.soundEffectCount < 50 && Client.areaSoundEffectVolume != 0) { + if (var0.soundEffects != null && var1 < var0.soundEffects.length) { + int var4 = var0.soundEffects[var1]; + if (var4 != 0) { + int var5 = var4 >> 8; + int var6 = var4 >> 4 & 7; + int var7 = var4 & 15; + Client.soundEffectIds[Client.soundEffectCount] = var5; + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6; + Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; + Client.soundEffects[Client.soundEffectCount] = null; + int var8 = (var2 - 64) / 128; + int var9 = (var3 - 64) / 128; + Client.soundLocations[Client.soundEffectCount] = var7 + (var9 << 8) + (var8 << 16); + ++Client.soundEffectCount; + } + } + } + } + + @ObfuscatedName("gx") + @ObfuscatedSignature( + signature = "(Lbv;IB)V", + garbageValue = "58" + ) + @Export("updateActorSequence") + static final void updateActorSequence(Actor var0, int var1) { + SequenceDefinition var2; + int var11; + if (var0.field950 > Client.cycle) { + ScriptEvent.method1180(var0); + } else if (var0.field969 >= Client.cycle) { + WorldMapSectionType.method239(var0); + } else { + var0.movementSequence = var0.readySequence; + if (var0.pathLength == 0) { + var0.field980 = 0; + } else { + label416: { + if (var0.sequence != -1 && var0.sequenceDelay == 0) { + var2 = WorldMapSection0.SequenceDefinition_get(var0.sequence); + if (var0.field926 > 0 && var2.field3478 == 0) { + ++var0.field980; + break label416; + } + + if (var0.field926 <= 0 && var2.field3493 == 0) { + ++var0.field980; + break label416; + } + } + + var11 = var0.x; + int var12 = var0.y; + int var4 = var0.pathX[var0.pathLength - 1] * 128 + var0.field925 * 64; + int var5 = var0.pathY[var0.pathLength - 1] * 128 + var0.field925 * 64; + if (var11 < var4) { + if (var12 < var5) { + var0.orientation = 1280; + } else if (var12 > var5) { + var0.orientation = 1792; + } else { + var0.orientation = 1536; + } + } else if (var11 > var4) { + if (var12 < var5) { + var0.orientation = 768; + } else if (var12 > var5) { + var0.orientation = 256; + } else { + var0.orientation = 512; + } + } else if (var12 < var5) { + var0.orientation = 1024; + } else if (var12 > var5) { + var0.orientation = 0; + } + + byte var6 = var0.pathTraversed[var0.pathLength - 1]; + if (var4 - var11 <= 256 && var4 - var11 >= -256 && var5 - var12 <= 256 && var5 - var12 >= -256) { + int var7 = var0.orientation - var0.rotation & 2047; + if (var7 > 1024) { + var7 -= 2048; + } + + int var8 = var0.walkBackSequence; + if (var7 >= -256 && var7 <= 256) { + var8 = var0.walkSequence; + } else if (var7 >= 256 && var7 < 768) { + var8 = var0.walkRightSequence; + } else if (var7 >= -768 && var7 <= -256) { + var8 = var0.walkLeftSequence; + } + + if (var8 == -1) { + var8 = var0.walkSequence; + } + + var0.movementSequence = var8; + int var9 = 4; + boolean var10 = true; + if (var0 instanceof NPC) { + var10 = ((NPC)var0).definition.isClickable; + } + + if (var10) { + if (var0.rotation != var0.orientation && var0.targetIndex == -1 && var0.field968 != 0) { + var9 = 2; + } + + if (var0.pathLength > 2) { + var9 = 6; + } + + if (var0.pathLength > 3) { + var9 = 8; + } + + if (var0.field980 > 0 && var0.pathLength > 1) { + var9 = 8; + --var0.field980; + } + } else { + if (var0.pathLength > 1) { + var9 = 6; + } + + if (var0.pathLength > 2) { + var9 = 8; + } + + if (var0.field980 > 0 && var0.pathLength > 1) { + var9 = 8; + --var0.field980; + } + } + + if (var6 == 2) { + var9 <<= 1; + } + + if (var9 >= 8 && var0.movementSequence == var0.walkSequence && var0.runSequence != -1) { + var0.movementSequence = var0.runSequence; + } + + if (var11 != var4 || var5 != var12) { + if (var11 < var4) { + var0.x += var9; + if (var0.x > var4) { + var0.x = var4; + } + } else if (var11 > var4) { + var0.x -= var9; + if (var0.x < var4) { + var0.x = var4; + } + } + + if (var12 < var5) { + var0.y += var9; + if (var0.y > var5) { + var0.y = var5; + } + } else if (var12 > var5) { + var0.y -= var9; + if (var0.y < var5) { + var0.y = var5; + } + } + } + + if (var4 == var0.x && var5 == var0.y) { + --var0.pathLength; + if (var0.field926 > 0) { + --var0.field926; + } + } + } else { + var0.x = var4; + var0.y = var5; + --var0.pathLength; + if (var0.field926 > 0) { + --var0.field926; + } + } + } } } - MusicPatch.foundItemIds = var2; - GrandExchangeOfferAgeComparator.foundItemIndex = 0; - UserComparator10.foundItemIdCount = var3; - String[] var8 = new String[UserComparator10.foundItemIdCount]; - - for (int var9 = 0; var9 < UserComparator10.foundItemIdCount; ++var9) { - var8[var9] = Interpreter.ItemDefinition_get(var2[var9]).name; + if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { + var0.sequence = -1; + var0.spotAnimation = -1; + var0.field950 = 0; + var0.field969 = 0; + var0.x = var0.pathX[0] * 128 + var0.field925 * 64; + var0.y = var0.pathY[0] * 128 + var0.field925 * 64; + var0.method1742(); + } + + if (localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { + var0.sequence = -1; + var0.spotAnimation = -1; + var0.field950 = 0; + var0.field969 = 0; + var0.x = var0.pathX[0] * 128 + var0.field925 * 64; + var0.y = var0.pathY[0] * 128 + var0.field925 * 64; + var0.method1742(); + } + + class3.method48(var0); + var0.isWalking = false; + if (var0.movementSequence != -1) { + var2 = WorldMapSection0.SequenceDefinition_get(var0.movementSequence); + if (var2 != null && var2.frameIds != null) { + ++var0.movementFrameCycle; + if (var0.movementFrame < var2.frameIds.length && var0.movementFrameCycle > var2.frameLengths[var0.movementFrame]) { + var0.movementFrameCycle = 1; + ++var0.movementFrame; + addSequenceSoundEffect(var2, var0.movementFrame, var0.x, var0.y); + } + + if (var0.movementFrame >= var2.frameIds.length) { + var0.movementFrameCycle = 0; + var0.movementFrame = 0; + addSequenceSoundEffect(var2, var0.movementFrame, var0.x, var0.y); + } + } else { + var0.movementSequence = -1; + } + } + + if (var0.spotAnimation != -1 && Client.cycle >= var0.field943) { + if (var0.spotAnimationFrame < 0) { + var0.spotAnimationFrame = 0; + } + + var11 = ClientPacket.SpotAnimationDefinition_get(var0.spotAnimation).sequence; + if (var11 != -1) { + SequenceDefinition var3 = WorldMapSection0.SequenceDefinition_get(var11); + if (var3 != null && var3.frameIds != null) { + ++var0.spotAnimationFrameCycle; + if (var0.spotAnimationFrame < var3.frameIds.length && var0.spotAnimationFrameCycle > var3.frameLengths[var0.spotAnimationFrame]) { + var0.spotAnimationFrameCycle = 1; + ++var0.spotAnimationFrame; + addSequenceSoundEffect(var3, var0.spotAnimationFrame, var0.x, var0.y); + } + + if (var0.spotAnimationFrame >= var3.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var3.frameIds.length)) { + var0.spotAnimation = -1; + } + } else { + var0.spotAnimation = -1; + } + } else { + var0.spotAnimation = -1; + } + } + + if (var0.sequence != -1 && var0.sequenceDelay <= 1) { + var2 = WorldMapSection0.SequenceDefinition_get(var0.sequence); + if (var2.field3478 == 1 && var0.field926 > 0 && var0.field950 <= Client.cycle && var0.field969 < Client.cycle) { + var0.sequenceDelay = 1; + return; + } + } + + if (var0.sequence != -1 && var0.sequenceDelay == 0) { + var2 = WorldMapSection0.SequenceDefinition_get(var0.sequence); + if (var2 != null && var2.frameIds != null) { + ++var0.sequenceFrameCycle; + if (var0.sequenceFrame < var2.frameIds.length && var0.sequenceFrameCycle > var2.frameLengths[var0.sequenceFrame]) { + var0.sequenceFrameCycle = 1; + ++var0.sequenceFrame; + addSequenceSoundEffect(var2, var0.sequenceFrame, var0.x, var0.y); + } + + if (var0.sequenceFrame >= var2.frameIds.length) { + var0.sequenceFrame -= var2.frameCount; + ++var0.field958; + if (var0.field958 >= var2.field3496) { + var0.sequence = -1; + } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var2.frameIds.length) { + addSequenceSoundEffect(var2, var0.sequenceFrame, var0.x, var0.y); + } else { + var0.sequence = -1; + } + } + + var0.isWalking = var2.field3488; + } else { + var0.sequence = -1; + } + } + + if (var0.sequenceDelay > 0) { + --var0.sequenceDelay; } - class3.method42(var8, MusicPatch.foundItemIds); } } diff --git a/runescape-client/src/main/java/Messages.java b/runescape-client/src/main/java/Messages.java index 7ce65fc1f4..27ba77cf62 100644 --- a/runescape-client/src/main/java/Messages.java +++ b/runescape-client/src/main/java/Messages.java @@ -1,3 +1,5 @@ +import java.io.File; +import java.io.IOException; import java.util.HashMap; import java.util.Map; import net.runelite.mapping.Export; @@ -5,44 +7,31 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("cq") +@ObfuscatedName("ce") @Implements("Messages") public class Messages { - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("Messages_channels") static final Map Messages_channels; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Llb;" + signature = "Llc;" ) @Export("Messages_hashTable") static final IterableNodeHashTable Messages_hashTable; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Ljz;" + signature = "Lji;" ) @Export("Messages_queue") static final IterableDualNodeQueue Messages_queue; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 2018287287 + intValue = -984405515 ) @Export("Messages_count") static int Messages_count; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -1088425627 - ) - @Export("PcmPlayer_sampleRate") - public static int PcmPlayer_sampleRate; - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "Lat;" - ) - @Export("worldMapEvent") - static WorldMapEvent worldMapEvent; static { Messages_channels = new HashMap(); @@ -51,47 +40,118 @@ public class Messages { Messages_count = 0; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Lhg;I)V", - garbageValue = "-1903945924" + signature = "(II)Z", + garbageValue = "-2062774197" ) - public static void method2230(Huffman var0) { - class210.huffman = var0; + public static boolean method2240(int var0) { + return var0 >= WorldMapDecorationType.field2719.id && var0 <= WorldMapDecorationType.field2708.id || var0 == WorldMapDecorationType.field2707.id; } - @ObfuscatedName("c") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(ILci;ZI)I", - garbageValue = "-1564166931" + signature = "(Lhz;I)V", + garbageValue = "2079698916" ) - static int method2241(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? Interpreter.field1090 : class188.field2352; - if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.method1655(MenuAction.getWidgetClickMask(var3)); - return 1; - } else if (var0 != ScriptOpcodes.CC_GETOP) { - if (var0 == ScriptOpcodes.CC_GETOPBASE) { - if (var3.dataText == null) { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var3.dataText; - } + public static void method2227(AbstractArchive var0) { + StructDefinition.StructDefinition_archive = var0; + } - return 1; - } else { - return 2; - } + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(IB)Lib;", + garbageValue = "83" + ) + @Export("FloorUnderlayDefinition_get") + public static FloorOverlayDefinition FloorUnderlayDefinition_get(int var0) { + FloorOverlayDefinition var1 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; } else { - int var4 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - --var4; - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var3.actions[var4]; - } else { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; + byte[] var2 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var0); + var1 = new FloorOverlayDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2), var0); } - return 1; + var1.postDecode(); + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var1, (long)var0); + return var1; } } + + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;Ljava/lang/String;ZI)Lmk;", + garbageValue = "1038906134" + ) + @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 (VertexNormal.cacheGamebuild == 33) { + var4 = "_rc"; + } else if (VertexNormal.cacheGamebuild == 34) { + var4 = "_wip"; + } + + File var5 = new File(ReflectionCheck.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); + AccessFile var6; + if (!var2 && var5.exists()) { + try { + var6 = new AccessFile(var5, "rw", 10000L); + return var6; + } catch (IOException var8) { + } + } + + try { + var6 = new AccessFile(var3, "rw", 10000L); + return var6; + } catch (IOException var7) { + throw new RuntimeException(); + } + } + + @ObfuscatedName("it") + @ObfuscatedSignature( + signature = "(Lcq;III)V", + garbageValue = "-1826909304" + ) + static final void method2231(MenuAction var0, int var1, int var2) { + AbstractWorldMapData.menuAction(var0.param0, var0.param1, var0.opcode, var0.identifier, var0.action, var0.action, var1, var2); + } + + @ObfuscatedName("jo") + @ObfuscatedSignature( + signature = "([Lha;Lha;ZI)V", + garbageValue = "1663251439" + ) + @Export("revalidateWidgetScroll") + static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { + int var3 = var1.scrollWidth != 0 ? var1.scrollWidth : var1.width; + int var4 = var1.scrollHeight != 0 ? var1.scrollHeight : var1.height; + FloorOverlayDefinition.resizeInterface(var0, var1.id, var3, var4, var2); + if (var1.children != null) { + FloorOverlayDefinition.resizeInterface(var1.children, var1.id, var3, var4, var2); + } + + InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); + if (var5 != null) { + LoginPacket.method3572(var5.group, var3, var4, var2); + } + + if (var1.contentType == 1337) { + } + + } } diff --git a/runescape-client/src/main/java/MidiFileReader.java b/runescape-client/src/main/java/MidiFileReader.java index 34a0c50528..f71371349c 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("gg") +@ObfuscatedName("gr") @Implements("MidiFileReader") public class MidiFileReader { - @ObfuscatedName("i") - static final byte[] field2478; - @ObfuscatedName("u") + @ObfuscatedName("d") + static final byte[] field2457; + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lkg;" + signature = "Lkq;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("division") int division; - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("trackStarts") int[] trackStarts; - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("trackPositions") int[] trackPositions; - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("trackLengths") int[] trackLengths; - @ObfuscatedName("p") - int[] field2474; - @ObfuscatedName("h") - int field2475; - @ObfuscatedName("w") - long field2482; + @ObfuscatedName("b") + int[] field2453; + @ObfuscatedName("e") + int field2451; + @ObfuscatedName("a") + long field2459; static { - field2478 = 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}; + field2457 = new byte[]{2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; } MidiFileReader(byte[] var1) { @@ -46,14 +46,14 @@ public class MidiFileReader { this.buffer = new Buffer((byte[])null); } - @ObfuscatedName("u") + @ObfuscatedName("f") @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.field2475 = 500000; + this.field2451 = 500000; this.trackStarts = new int[var2]; Buffer var10000; @@ -70,7 +70,7 @@ public class MidiFileReader { var10000 = this.buffer; } - this.field2482 = 0L; + this.field2459 = 0L; this.trackPositions = new int[var2]; for (var3 = 0; var3 < var2; ++var3) { @@ -78,50 +78,50 @@ public class MidiFileReader { } this.trackLengths = new int[var2]; - this.field2474 = new int[var2]; + this.field2453 = new int[var2]; } - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("clear") void clear() { this.buffer.array = null; this.trackStarts = null; this.trackPositions = null; this.trackLengths = null; - this.field2474 = null; + this.field2453 = null; } - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("isReady") boolean isReady() { return this.buffer.array != null; } - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("trackCount") int trackCount() { return this.trackPositions.length; } - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("gotoTrack") void gotoTrack(int var1) { this.buffer.offset = this.trackPositions[var1]; } - @ObfuscatedName("p") + @ObfuscatedName("b") @Export("markTrackPosition") void markTrackPosition(int var1) { this.trackPositions[var1] = this.buffer.offset; } - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("setTrackDone") void setTrackDone() { this.buffer.offset = -1; } - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("readTrackLength") void readTrackLength(int var1) { int var2 = this.buffer.readVarInt(); @@ -129,36 +129,36 @@ public class MidiFileReader { var10000[var1] += var2; } - @ObfuscatedName("w") + @ObfuscatedName("a") @Export("readMessage") int readMessage(int var1) { int var2 = this.readMessage0(var1); return var2; } - @ObfuscatedName("i") + @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.field2474[var1] = var5; + this.field2453[var1] = var5; ++this.buffer.offset; } else { - var5 = this.field2474[var1]; + var5 = this.field2453[var1]; } if (var5 != 240 && var5 != 247) { - return this.method3895(var1, var5); + return this.method3828(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.field2474[var1] = var4; - return this.method3895(var1, var4); + this.field2453[var1] = var4; + return this.method3828(var1, var4); } } @@ -168,8 +168,8 @@ public class MidiFileReader { } } - @ObfuscatedName("k") - int method3895(int var1, int var2) { + @ObfuscatedName("c") + int method3828(int var1, int var2) { int var4; if (var2 == 255) { int var7 = this.buffer.readUnsignedByte(); @@ -183,8 +183,8 @@ public class MidiFileReader { int var5 = this.buffer.readMedium(); var4 -= 3; int var6 = this.trackLengths[var1]; - this.field2482 += (long)var6 * (long)(this.field2475 - var5); - this.field2475 = var5; + this.field2459 += (long)var6 * (long)(this.field2451 - var5); + this.field2451 = var5; var10000 = this.buffer; var10000.offset += var4; return 2; @@ -194,7 +194,7 @@ public class MidiFileReader { return 3; } } else { - byte var3 = field2478[var2 - 128]; + byte var3 = field2457[var2 - 128]; var4 = var2; if (var3 >= 1) { var4 = var2 | this.buffer.readUnsignedByte() << 8; @@ -208,12 +208,12 @@ public class MidiFileReader { } } - @ObfuscatedName("x") - long method3906(int var1) { - return this.field2482 + (long)var1 * (long)this.field2475; + @ObfuscatedName("o") + long method3829(int var1) { + return this.field2459 + (long)var1 * (long)this.field2451; } - @ObfuscatedName("o") + @ObfuscatedName("l") @Export("getPrioritizedTrack") int getPrioritizedTrack() { int var1 = this.trackPositions.length; @@ -230,7 +230,7 @@ public class MidiFileReader { return var2; } - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("isDone") boolean isDone() { int var1 = this.trackPositions.length; @@ -244,15 +244,15 @@ public class MidiFileReader { return true; } - @ObfuscatedName("n") + @ObfuscatedName("j") @Export("reset") void reset(long var1) { - this.field2482 = var1; + this.field2459 = var1; int var3 = this.trackPositions.length; for (int var4 = 0; var4 < var3; ++var4) { this.trackLengths[var4] = 0; - this.field2474[var4] = 0; + this.field2453[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 6aca87810b..804a38c472 100644 --- a/runescape-client/src/main/java/MidiPcmStream.java +++ b/runescape-client/src/main/java/MidiPcmStream.java @@ -3,156 +3,157 @@ 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("gz") +@ObfuscatedName("gm") @Implements("MidiPcmStream") public class MidiPcmStream extends PcmStream { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lle;" ) @Export("musicPatches") NodeHashTable musicPatches; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -1040348167 - ) - int field2417; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = -618997033 - ) - int field2419; - @ObfuscatedName("g") - int[] field2437; - @ObfuscatedName("z") - int[] field2420; - @ObfuscatedName("p") - int[] field2442; - @ObfuscatedName("h") - int[] field2422; - @ObfuscatedName("y") - int[] field2421; @ObfuscatedName("i") - int[] field2424; - @ObfuscatedName("k") - int[] field2425; + @ObfuscatedGetter( + intValue = -1491011005 + ) + int field2401; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = -1592176192 + ) + int field2402; + @ObfuscatedName("p") + int[] field2405; + @ObfuscatedName("b") + int[] field2404; + @ObfuscatedName("e") + int[] field2408; @ObfuscatedName("x") - int[] field2443; + int[] field2406; + @ObfuscatedName("a") + int[] field2407; + @ObfuscatedName("d") + int[] field2414; + @ObfuscatedName("c") + int[] field2410; @ObfuscatedName("o") - int[] field2427; - @ObfuscatedName("s") - int[] field2428; - @ObfuscatedName("t") - int[] field2440; - @ObfuscatedName("m") - int[] field2430; + int[] field2426; @ObfuscatedName("v") - int[] field2441; + int[] field2411; + @ObfuscatedName("u") + int[] field2412; + @ObfuscatedName("z") + int[] field2413; + @ObfuscatedName("h") + int[] field2417; + @ObfuscatedName("m") + int[] field2415; + @ObfuscatedName("g") + int[] field2416; + @ObfuscatedName("r") + int[] field2425; @ObfuscatedName("q") - int[] field2432; - @ObfuscatedName("l") - int[] field2433; - @ObfuscatedName("j") @ObfuscatedSignature( - signature = "[[Lge;" + signature = "[[Lgl;" ) - MusicPatchNode[][] field2434; - @ObfuscatedName("af") + MusicPatchNode[][] field2418; + @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "[[Lge;" + signature = "[[Lgl;" ) - MusicPatchNode[][] field2435; - @ObfuscatedName("ad") + MusicPatchNode[][] field2419; + @ObfuscatedName("av") @ObfuscatedSignature( - signature = "Lgg;" + signature = "Lgr;" ) @Export("midiFile") MidiFileReader midiFile; - @ObfuscatedName("am") - boolean field2426; - @ObfuscatedName("ai") + @ObfuscatedName("aw") + boolean field2403; + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -664864555 + intValue = 1794419739 ) @Export("track") int track; - @ObfuscatedName("ag") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -1177592685 + intValue = 198679967 ) @Export("trackLength") int trackLength; - @ObfuscatedName("ao") + @ObfuscatedName("au") @ObfuscatedGetter( - longValue = -3140797067045383129L + longValue = 2302108536441075195L ) - long field2431; - @ObfuscatedName("aw") + long field2409; + @ObfuscatedName("ah") @ObfuscatedGetter( - longValue = 7928451830395047815L + longValue = 307933058588373345L ) - long field2416; - @ObfuscatedName("ak") + long field2400; + @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "Lgr;" + signature = "Lgy;" ) @Export("patchStream") MusicPatchPcmStream patchStream; public MidiPcmStream() { - this.field2417 = 256; - this.field2419 = 1000000; - this.field2437 = new int[16]; - this.field2420 = new int[16]; - this.field2442 = new int[16]; - this.field2422 = new int[16]; - this.field2421 = new int[16]; - this.field2424 = new int[16]; + this.field2401 = 256; + this.field2402 = -727379968; + this.field2405 = new int[16]; + this.field2404 = new int[16]; + this.field2408 = new int[16]; + this.field2406 = new int[16]; + this.field2407 = new int[16]; + this.field2414 = new int[16]; + this.field2410 = new int[16]; + this.field2426 = new int[16]; + this.field2411 = new int[16]; + this.field2412 = new int[16]; + this.field2413 = new int[16]; + this.field2417 = new int[16]; + this.field2415 = new int[16]; + this.field2416 = new int[16]; this.field2425 = new int[16]; - this.field2443 = new int[16]; - this.field2427 = new int[16]; - this.field2428 = new int[16]; - this.field2440 = new int[16]; - this.field2430 = new int[16]; - this.field2441 = new int[16]; - this.field2432 = new int[16]; - this.field2433 = new int[16]; - this.field2434 = new MusicPatchNode[16][128]; - this.field2435 = new MusicPatchNode[16][128]; + this.field2418 = new MusicPatchNode[16][128]; + this.field2419 = new MusicPatchNode[16][128]; this.midiFile = new MidiFileReader(); this.patchStream = new MusicPatchPcmStream(this); this.musicPatches = new NodeHashTable(128); - this.method3787(); - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "31" - ) - @Export("setPcmStreamVolume") - public synchronized void setPcmStreamVolume(int var1) { - this.field2417 = var1; + this.method3713(); } @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-847322953" + signature = "(IB)V", + garbageValue = "-114" ) - int method3769() { - return this.field2417; + @Export("setPcmStreamVolume") + public synchronized void setPcmStreamVolume(int var1) { + this.field2401 = var1; } - @ObfuscatedName("b") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lgt;Lhf;Ldk;II)Z", - garbageValue = "612802869" + signature = "(I)I", + garbageValue = "-493640241" + ) + public int method3692() { + return this.field2401; + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "(Lgh;Lhz;Ldx;IB)Z", + garbageValue = "-70" ) @Export("loadMusicTrack") - public synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) { - var1.method3987(); + synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) { + var1.method3909(); boolean var5 = true; int[] var6 = null; if (var4 > 0) { @@ -180,7 +181,7 @@ public class MidiPcmStream extends PcmStream { this.musicPatches.put(var10, (long)var8); } - if (!var9.method3952(var3, var7.byteArray, var6)) { + if (!var9.method3868(var3, var7.byteArray, var6)) { var5 = false; } } @@ -192,91 +193,91 @@ public class MidiPcmStream extends PcmStream { return var5; } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "34" + signature = "(I)V", + garbageValue = "2127021512" ) @Export("clearAll") - public synchronized void clearAll() { + synchronized void clearAll() { for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { var1.clear(); } } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1987681948" + garbageValue = "1176927011" ) @Export("removeAll") - synchronized void removeAll() { + public synchronized void removeAll() { for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { var1.remove(); } } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "()Ldt;" + signature = "()Ldl;" ) @Export("firstSubStream") protected synchronized PcmStream firstSubStream() { return this.patchStream; } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "()Ldt;" + signature = "()Ldl;" ) @Export("nextSubStream") protected synchronized PcmStream nextSubStream() { return null; } - @ObfuscatedName("y") - protected synchronized int vmethod3963() { + @ObfuscatedName("x") + protected synchronized int vmethod3889() { return 0; } - @ObfuscatedName("w") + @ObfuscatedName("a") @Export("fill") protected synchronized void fill(int[] var1, int var2, int var3) { if (this.midiFile.isReady()) { - int var4 = this.midiFile.division * this.field2419 * -727379968 / Messages.PcmPlayer_sampleRate; + int var4 = this.midiFile.division * this.field2402 * 1000000 / (DirectByteArrayCopier.field2490 * -168449264); do { - long var5 = this.field2431 + (long)var4 * (long)var3; - if (this.field2416 - var5 >= 0L) { - this.field2431 = var5; + long var5 = this.field2409 + (long)var4 * (long)var3; + if (this.field2400 - var5 >= 0L) { + this.field2409 = var5; break; } - int var7 = (int)((this.field2416 - this.field2431 + (long)var4 - 1L) / (long)var4); - this.field2431 += (long)var4 * (long)var7; + int var7 = (int)((this.field2400 - this.field2409 + (long)var4 - 1L) / (long)var4); + this.field2409 += (long)var4 * (long)var7; this.patchStream.fill(var1, var2, var7); var2 += var7; var3 -= var7; - this.method3800(); + this.method3726(); } while(this.midiFile.isReady()); } this.patchStream.fill(var1, var2, var3); } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lgt;ZI)V", - garbageValue = "1137691865" + signature = "(Lgh;ZI)V", + garbageValue = "-1969795469" ) @Export("setMusicTrack") - public synchronized void setMusicTrack(MusicTrack var1, boolean var2) { + synchronized void setMusicTrack(MusicTrack var1, boolean var2) { this.clear(); this.midiFile.parse(var1.midi); - this.field2426 = var2; - this.field2431 = 0L; + this.field2403 = var2; + this.field2409 = 0L; int var3 = this.midiFile.trackCount(); for (int var4 = 0; var4 < var3; ++var4) { @@ -287,248 +288,248 @@ public class MidiPcmStream extends PcmStream { this.track = this.midiFile.getPrioritizedTrack(); this.trackLength = this.midiFile.trackLengths[this.track]; - this.field2416 = this.midiFile.method3906(this.trackLength); + this.field2400 = this.midiFile.method3829(this.trackLength); } - @ObfuscatedName("k") + @ObfuscatedName("c") @Export("skip") protected synchronized void skip(int var1) { if (this.midiFile.isReady()) { - int var2 = this.midiFile.division * this.field2419 * -727379968 / Messages.PcmPlayer_sampleRate; + int var2 = this.midiFile.division * this.field2402 * 1000000 / (DirectByteArrayCopier.field2490 * -168449264); do { - long var3 = this.field2431 + (long)var2 * (long)var1; - if (this.field2416 - var3 >= 0L) { - this.field2431 = var3; + long var3 = (long)var2 * (long)var1 + this.field2409; + if (this.field2400 - var3 >= 0L) { + this.field2409 = var3; break; } - int var5 = (int)(((long)var2 + (this.field2416 - this.field2431) - 1L) / (long)var2); - this.field2431 += (long)var5 * (long)var2; + int var5 = (int)(((long)var2 + (this.field2400 - this.field2409) - 1L) / (long)var2); + this.field2409 += (long)var2 * (long)var5; this.patchStream.skip(var5); var1 -= var5; - this.method3800(); + this.method3726(); } while(this.midiFile.isReady()); } this.patchStream.skip(var1); } - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-196539834" + garbageValue = "-1463582858" ) @Export("clear") public synchronized void clear() { this.midiFile.clear(); - this.method3787(); + this.method3713(); } - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "2105523598" + garbageValue = "-1439399631" ) @Export("isReady") public synchronized boolean isReady() { return this.midiFile.isReady(); } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "2056390451" + garbageValue = "1663251439" ) - public synchronized void method3775(int var1, int var2) { - this.method3817(var1, var2); + public synchronized void method3765(int var1, int var2) { + this.method3784(var1, var2); + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(IIB)V", + garbageValue = "44" + ) + void method3784(int var1, int var2) { + this.field2406[var1] = var2; + this.field2414[var1] = var2 & -128; + this.method3703(var1, var2); } @ObfuscatedName("n") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "-1275355891" + garbageValue = "1182045133" ) - void method3817(int var1, int var2) { - this.field2422[var1] = var2; - this.field2424[var1] = var2 & -128; - this.method3777(var1, var2); - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "-1314090559" - ) - void method3777(int var1, int var2) { - if (var2 != this.field2421[var1]) { - this.field2421[var1] = var2; + void method3703(int var1, int var2) { + if (var2 != this.field2407[var1]) { + this.field2407[var1] = var2; for (int var3 = 0; var3 < 128; ++var3) { - this.field2435[var1][var3] = null; + this.field2419[var1][var3] = null; } } } - @ObfuscatedName("s") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(IIII)V", - garbageValue = "1833290175" + garbageValue = "1071625485" ) - void method3778(int var1, int var2, int var3) { - this.method3816(var1, var2, 64); - if ((this.field2428[var1] & 2) != 0) { + void method3704(int var1, int var2, int var3) { + this.method3735(var1, var2, 64); + if ((this.field2412[var1] & 2) != 0) { for (MusicPatchNode var4 = (MusicPatchNode)this.patchStream.queue.first(); var4 != null; var4 = (MusicPatchNode)this.patchStream.queue.next()) { - if (var4.field2449 == var1 && var4.field2459 < 0) { - this.field2434[var1][var4.field2450] = null; - this.field2434[var1][var2] = var4; - int var5 = (var4.field2455 * var4.field2454 >> 12) + var4.field2465; - var4.field2465 += var2 - var4.field2450 << 8; - var4.field2454 = var5 - var4.field2465; - var4.field2455 = 4096; - var4.field2450 = var2; + if (var4.field2444 == var1 && var4.field2441 < 0) { + this.field2418[var1][var4.field2432] = null; + this.field2418[var1][var2] = var4; + int var5 = (var4.field2434 * var4.field2437 >> 12) + var4.field2435; + var4.field2435 += var2 - var4.field2432 << 8; + var4.field2434 = var5 - var4.field2435; + var4.field2437 = 4096; + var4.field2432 = var2; return; } } } - MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field2421[var1]); + MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field2407[var1]); if (var9 != null) { RawSound var8 = var9.rawSounds[var2]; if (var8 != null) { MusicPatchNode var6 = new MusicPatchNode(); - var6.field2449 = var1; + var6.field2444 = var1; var6.patch = var9; var6.rawSound = var8; - var6.field2448 = var9.field2488[var2]; - var6.field2445 = var9.field2487[var2]; - var6.field2450 = var2; - var6.field2451 = var3 * var3 * var9.field2486[var2] * var9.field2489 + 1024 >> 11; - var6.field2452 = var9.field2483[var2] & 255; - var6.field2465 = (var2 << 8) - (var9.field2485[var2] & 32767); - var6.field2456 = 0; - var6.field2457 = 0; - var6.field2458 = 0; - var6.field2459 = -1; - var6.field2460 = 0; - if (this.field2441[var1] == 0) { - var6.stream = RawPcmStream.method2568(var8, this.method3862(var6), this.method3793(var6), this.method3794(var6)); + var6.field2430 = var9.field2462[var2]; + var6.field2436 = var9.field2468[var2]; + var6.field2432 = var2; + var6.field2433 = var3 * var3 * var9.field2466[var2] * var9.field2467 + 1024 >> 11; + var6.field2442 = var9.field2470[var2] & 255; + var6.field2435 = (var2 << 8) - (var9.field2464[var2] & 32767); + var6.field2446 = 0; + var6.field2439 = 0; + var6.field2440 = 0; + var6.field2441 = -1; + var6.field2438 = 0; + if (this.field2415[var1] == 0) { + var6.stream = RawPcmStream.method2582(var8, this.method3736(var6), this.method3719(var6), this.method3720(var6)); } else { - var6.stream = RawPcmStream.method2568(var8, this.method3862(var6), 0, this.method3794(var6)); - this.method3779(var6, var9.field2485[var2] < 0); + var6.stream = RawPcmStream.method2582(var8, this.method3736(var6), 0, this.method3720(var6)); + this.method3764(var6, var9.field2464[var2] < 0); } - if (var9.field2485[var2] < 0) { + if (var9.field2464[var2] < 0) { var6.stream.setNumLoops(-1); } - if (var6.field2445 >= 0) { - MusicPatchNode var7 = this.field2435[var1][var6.field2445]; - if (var7 != null && var7.field2459 < 0) { - this.field2434[var1][var7.field2450] = null; - var7.field2459 = 0; + if (var6.field2436 >= 0) { + MusicPatchNode var7 = this.field2419[var1][var6.field2436]; + if (var7 != null && var7.field2441 < 0) { + this.field2418[var1][var7.field2432] = null; + var7.field2441 = 0; } - this.field2435[var1][var6.field2445] = var6; + this.field2419[var1][var6.field2436] = var6; } this.patchStream.queue.addFirst(var6); - this.field2434[var1][var2] = var6; + this.field2418[var1][var2] = var6; } } } - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(Lge;ZI)V", - garbageValue = "-1090319556" + signature = "(Lgl;ZI)V", + garbageValue = "-1980997647" ) - void method3779(MusicPatchNode var1, boolean var2) { + void method3764(MusicPatchNode var1, boolean var2) { int var3 = var1.rawSound.samples.length; int var4; - if (var2 && var1.rawSound.field1378) { + if (var2 && var1.rawSound.field1352) { int var5 = var3 + var3 - var1.rawSound.start; - var4 = (int)((long)this.field2441[var1.field2449] * (long)var5 >> 6); + var4 = (int)((long)var5 * (long)this.field2415[var1.field2444] >> 6); var3 <<= 8; if (var4 >= var3) { var4 = var3 + var3 - 1 - var4; - var1.stream.method2578(); + var1.stream.method2555(); } } else { - var4 = (int)((long)var3 * (long)this.field2441[var1.field2449] >> 6); + var4 = (int)((long)this.field2415[var1.field2444] * (long)var3 >> 6); } - var1.stream.method2722(var4); + var1.stream.method2554(var4); } - @ObfuscatedName("m") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(IIIB)V", - garbageValue = "-33" + signature = "(IIII)V", + garbageValue = "-717323373" ) - void method3816(int var1, int var2, int var3) { - MusicPatchNode var4 = this.field2434[var1][var2]; + void method3735(int var1, int var2, int var3) { + MusicPatchNode var4 = this.field2418[var1][var2]; if (var4 != null) { - this.field2434[var1][var2] = null; - if ((this.field2428[var1] & 2) != 0) { + this.field2418[var1][var2] = null; + if ((this.field2412[var1] & 2) != 0) { for (MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var5.field2449 == var4.field2449 && var5.field2459 < 0 && var5 != var4) { - var4.field2459 = 0; + if (var5.field2444 == var4.field2444 && var5.field2441 < 0 && var5 != var4) { + var4.field2441 = 0; break; } } } else { - var4.field2459 = 0; + var4.field2441 = 0; } } } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IIIB)V", - garbageValue = "-115" + signature = "(IIII)V", + garbageValue = "1882331860" ) - void method3781(int var1, int var2, int var3) { - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "-1083073471" - ) - void method3782(int var1, int var2) { - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "683649842" - ) - void method3783(int var1, int var2) { - this.field2425[var1] = var2; + void method3707(int var1, int var2, int var3) { } @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "41766095" + signature = "(IIS)V", + garbageValue = "14904" ) - void method3784(int var1) { + void method3729(int var1, int var2) { + } + + @ObfuscatedName("av") + @ObfuscatedSignature( + signature = "(III)V", + garbageValue = "1757965931" + ) + void method3709(int var1, int var2) { + this.field2410[var1] = var2; + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + signature = "(IB)V", + garbageValue = "0" + ) + void method3794(int var1) { for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var1 < 0 || var2.field2449 == var1) { + if (var1 < 0 || var2.field2444 == var1) { if (var2.stream != null) { - var2.stream.method2582(Messages.PcmPlayer_sampleRate / 100); - if (var2.stream.method2686()) { + var2.stream.method2559(DirectByteArrayCopier.field2490 * -168449264 / 100); + if (var2.stream.method2563()) { this.patchStream.mixer.addSubStream(var2.stream); } - var2.method3893(); + var2.method3809(); } - if (var2.field2459 < 0) { - this.field2434[var2.field2449][var2.field2450] = null; + if (var2.field2441 < 0) { + this.field2418[var2.field2444][var2.field2432] = null; } var2.remove(); @@ -537,107 +538,107 @@ public class MidiPcmStream extends PcmStream { } - @ObfuscatedName("ab") - @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "54" - ) - void method3820(int var1) { - if (var1 >= 0) { - this.field2437[var1] = 12800; - this.field2420[var1] = 8192; - this.field2442[var1] = 16383; - this.field2425[var1] = 8192; - this.field2443[var1] = 0; - this.field2427[var1] = 8192; - this.method3837(var1); - this.method3789(var1); - this.field2428[var1] = 0; - this.field2440[var1] = 32767; - this.field2430[var1] = 256; - this.field2441[var1] = 0; - this.method3791(var1, 8192); - } else { - for (var1 = 0; var1 < 16; ++var1) { - this.method3820(var1); - } - - } - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "122" - ) - void method3786(int var1) { - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if ((var1 < 0 || var2.field2449 == var1) && var2.field2459 < 0) { - this.field2434[var2.field2449][var2.field2450] = null; - var2.field2459 = 0; - } - } - - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-18" - ) - void method3787() { - this.method3784(-1); - this.method3820(-1); - - int var1; - for (var1 = 0; var1 < 16; ++var1) { - this.field2421[var1] = this.field2422[var1]; - } - - for (var1 = 0; var1 < 16; ++var1) { - this.field2424[var1] = this.field2422[var1] & -128; - } - - } - - @ObfuscatedName("az") + @ObfuscatedName("ag") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "1524706833" + garbageValue = "80676363" ) - void method3837(int var1) { - if ((this.field2428[var1] & 2) != 0) { - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var2.field2449 == var1 && this.field2434[var1][var2.field2450] == null && var2.field2459 < 0) { - var2.field2459 = 0; - } + void method3711(int var1) { + if (var1 >= 0) { + this.field2405[var1] = 12800; + this.field2404[var1] = 8192; + this.field2408[var1] = 16383; + this.field2410[var1] = 8192; + this.field2426[var1] = 0; + this.field2411[var1] = 8192; + this.method3714(var1); + this.method3806(var1); + this.field2412[var1] = 0; + this.field2413[var1] = 32767; + this.field2417[var1] = 256; + this.field2415[var1] = 0; + this.method3717(var1, 8192); + } else { + for (var1 = 0; var1 < 16; ++var1) { + this.method3711(var1); } - } + } } @ObfuscatedName("ae") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-339945953" + garbageValue = "89058460" ) - void method3789(int var1) { - if ((this.field2428[var1] & 4) != 0) { - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var2.field2449 == var1) { - var2.field2463 = 0; - } + void method3712(int var1) { + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { + if ((var1 < 0 || var2.field2444 == var1) && var2.field2441 < 0) { + this.field2418[var2.field2444][var2.field2432] = null; + var2.field2441 = 0; } } } + @ObfuscatedName("ad") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "140896410" + ) + void method3713() { + this.method3794(-1); + this.method3711(-1); + + int var1; + for (var1 = 0; var1 < 16; ++var1) { + this.field2407[var1] = this.field2406[var1]; + } + + for (var1 = 0; var1 < 16; ++var1) { + this.field2414[var1] = this.field2406[var1] & -128; + } + + } + @ObfuscatedName("aj") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "640708386" + garbageValue = "-2012572160" ) - void method3770(int var1) { + void method3714(int var1) { + if ((this.field2412[var1] & 2) != 0) { + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { + if (var2.field2444 == var1 && this.field2418[var1][var2.field2432] == null && var2.field2441 < 0) { + var2.field2441 = 0; + } + } + } + + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "-4452190" + ) + void method3806(int var1) { + if ((this.field2412[var1] & 4) != 0) { + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { + if (var2.field2444 == var1) { + var2.field2447 = 0; + } + } + } + + } + + @ObfuscatedName("af") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "-1796286061" + ) + void method3697(int var1) { int var2 = var1 & 240; int var3; int var4; @@ -646,182 +647,182 @@ public class MidiPcmStream extends PcmStream { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; - this.method3816(var3, var4, var5); + this.method3735(var3, var4, var5); } else if (var2 == 144) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; if (var5 > 0) { - this.method3778(var3, var4, var5); + this.method3704(var3, var4, var5); } else { - this.method3816(var3, var4, 64); + this.method3735(var3, var4, 64); } } else if (var2 == 160) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; - this.method3781(var3, var4, var5); + this.method3707(var3, var4, var5); } else if (var2 == 176) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; if (var4 == 0) { - this.field2424[var3] = (var5 << 14) + (this.field2424[var3] & -2080769); + this.field2414[var3] = (var5 << 14) + (this.field2414[var3] & -2080769); } if (var4 == 32) { - this.field2424[var3] = (var5 << 7) + (this.field2424[var3] & -16257); + this.field2414[var3] = (var5 << 7) + (this.field2414[var3] & -16257); } if (var4 == 1) { - this.field2443[var3] = (var5 << 7) + (this.field2443[var3] & -16257); + this.field2426[var3] = (var5 << 7) + (this.field2426[var3] & -16257); } if (var4 == 33) { - this.field2443[var3] = var5 + (this.field2443[var3] & -128); + this.field2426[var3] = var5 + (this.field2426[var3] & -128); } if (var4 == 5) { - this.field2427[var3] = (var5 << 7) + (this.field2427[var3] & -16257); + this.field2411[var3] = (var5 << 7) + (this.field2411[var3] & -16257); } if (var4 == 37) { - this.field2427[var3] = var5 + (this.field2427[var3] & -128); + this.field2411[var3] = var5 + (this.field2411[var3] & -128); } if (var4 == 7) { - this.field2437[var3] = (var5 << 7) + (this.field2437[var3] & -16257); + this.field2405[var3] = (var5 << 7) + (this.field2405[var3] & -16257); } if (var4 == 39) { - this.field2437[var3] = var5 + (this.field2437[var3] & -128); + this.field2405[var3] = var5 + (this.field2405[var3] & -128); } if (var4 == 10) { - this.field2420[var3] = (var5 << 7) + (this.field2420[var3] & -16257); + this.field2404[var3] = (var5 << 7) + (this.field2404[var3] & -16257); } if (var4 == 42) { - this.field2420[var3] = var5 + (this.field2420[var3] & -128); + this.field2404[var3] = var5 + (this.field2404[var3] & -128); } if (var4 == 11) { - this.field2442[var3] = (var5 << 7) + (this.field2442[var3] & -16257); + this.field2408[var3] = (var5 << 7) + (this.field2408[var3] & -16257); } if (var4 == 43) { - this.field2442[var3] = var5 + (this.field2442[var3] & -128); + this.field2408[var3] = var5 + (this.field2408[var3] & -128); } int[] var10000; if (var4 == 64) { if (var5 >= 64) { - var10000 = this.field2428; + var10000 = this.field2412; var10000[var3] |= 1; } else { - var10000 = this.field2428; + var10000 = this.field2412; var10000[var3] &= -2; } } if (var4 == 65) { if (var5 >= 64) { - var10000 = this.field2428; + var10000 = this.field2412; var10000[var3] |= 2; } else { - this.method3837(var3); - var10000 = this.field2428; + this.method3714(var3); + var10000 = this.field2412; var10000[var3] &= -3; } } if (var4 == 99) { - this.field2440[var3] = (var5 << 7) + (this.field2440[var3] & 127); + this.field2413[var3] = (var5 << 7) + (this.field2413[var3] & 127); } if (var4 == 98) { - this.field2440[var3] = (this.field2440[var3] & 16256) + var5; + this.field2413[var3] = (this.field2413[var3] & 16256) + var5; } if (var4 == 101) { - this.field2440[var3] = (var5 << 7) + (this.field2440[var3] & 127) + 16384; + this.field2413[var3] = (var5 << 7) + (this.field2413[var3] & 127) + 16384; } if (var4 == 100) { - this.field2440[var3] = (this.field2440[var3] & 16256) + var5 + 16384; + this.field2413[var3] = (this.field2413[var3] & 16256) + var5 + 16384; } if (var4 == 120) { - this.method3784(var3); + this.method3794(var3); } if (var4 == 121) { - this.method3820(var3); + this.method3711(var3); } if (var4 == 123) { - this.method3786(var3); + this.method3712(var3); } int var6; if (var4 == 6) { - var6 = this.field2440[var3]; + var6 = this.field2413[var3]; if (var6 == 16384) { - this.field2430[var3] = (var5 << 7) + (this.field2430[var3] & -16257); + this.field2417[var3] = (var5 << 7) + (this.field2417[var3] & -16257); } } if (var4 == 38) { - var6 = this.field2440[var3]; + var6 = this.field2413[var3]; if (var6 == 16384) { - this.field2430[var3] = var5 + (this.field2430[var3] & -128); + this.field2417[var3] = var5 + (this.field2417[var3] & -128); } } if (var4 == 16) { - this.field2441[var3] = (var5 << 7) + (this.field2441[var3] & -16257); + this.field2415[var3] = (var5 << 7) + (this.field2415[var3] & -16257); } if (var4 == 48) { - this.field2441[var3] = var5 + (this.field2441[var3] & -128); + this.field2415[var3] = var5 + (this.field2415[var3] & -128); } if (var4 == 81) { if (var5 >= 64) { - var10000 = this.field2428; + var10000 = this.field2412; var10000[var3] |= 4; } else { - this.method3789(var3); - var10000 = this.field2428; + this.method3806(var3); + var10000 = this.field2412; var10000[var3] &= -5; } } if (var4 == 17) { - this.method3791(var3, (var5 << 7) + (this.field2432[var3] & -16257)); + this.method3717(var3, (var5 << 7) + (this.field2416[var3] & -16257)); } if (var4 == 49) { - this.method3791(var3, var5 + (this.field2432[var3] & -128)); + this.method3717(var3, var5 + (this.field2416[var3] & -128)); } } else if (var2 == 192) { var3 = var1 & 15; var4 = var1 >> 8 & 127; - this.method3777(var3, var4 + this.field2424[var3]); + this.method3703(var3, var4 + this.field2414[var3]); } else if (var2 == 208) { var3 = var1 & 15; var4 = var1 >> 8 & 127; - this.method3782(var3, var4); + this.method3729(var3, var4); } else if (var2 == 224) { var3 = var1 & 15; var4 = (var1 >> 8 & 127) + (var1 >> 9 & 16256); - this.method3783(var3, var4); + this.method3709(var3, var4); } else { var2 = var1 & 255; if (var2 == 255) { - this.method3787(); + this.method3713(); } } } @@ -829,106 +830,106 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("ap") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "-2102724080" + garbageValue = "1984762268" ) - void method3791(int var1, int var2) { - this.field2432[var1] = var2; - this.field2433[var1] = (int)(2097152.0D * Math.pow(2.0D, 5.4931640625E-4D * (double)var2) + 0.5D); + void method3717(int var1, int var2) { + this.field2416[var1] = var2; + this.field2425[var1] = (int)(2097152.0D * Math.pow(2.0D, 5.4931640625E-4D * (double)var2) + 0.5D); } - @ObfuscatedName("an") + @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(Lge;B)I", - garbageValue = "1" + signature = "(Lgl;S)I", + garbageValue = "-5445" ) - int method3862(MusicPatchNode var1) { - int var2 = (var1.field2455 * var1.field2454 >> 12) + var1.field2465; - var2 += (this.field2425[var1.field2449] - 8192) * this.field2430[var1.field2449] >> 12; - MusicPatchNode2 var3 = var1.field2448; + int method3736(MusicPatchNode var1) { + int var2 = (var1.field2437 * var1.field2434 >> 12) + var1.field2435; + var2 += (this.field2410[var1.field2444] - 8192) * this.field2417[var1.field2444] >> 12; + MusicPatchNode2 var3 = var1.field2430; int var4; - if (var3.field2405 > 0 && (var3.field2401 > 0 || this.field2443[var1.field2449] > 0)) { - var4 = var3.field2401 << 2; - int var5 = var3.field2402 << 1; - if (var1.field2461 < var5) { - var4 = var4 * var1.field2461 / var5; + if (var3.field2383 > 0 && (var3.field2382 > 0 || this.field2426[var1.field2444] > 0)) { + var4 = var3.field2382 << 2; + int var5 = var3.field2380 << 1; + if (var1.field2443 < var5) { + var4 = var4 * var1.field2443 / var5; } - var4 += this.field2443[var1.field2449] >> 7; - double var6 = Math.sin(0.01227184630308513D * (double)(var1.field2462 & 511)); + var4 += this.field2426[var1.field2444] >> 7; + double var6 = Math.sin(0.01227184630308513D * (double)(var1.field2427 & 511)); var2 += (int)(var6 * (double)var4); } - var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, (double)var2 * 3.255208333333333E-4D) / (double)Messages.PcmPlayer_sampleRate + 0.5D); + var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, 3.255208333333333E-4D * (double)var2) / (double)(DirectByteArrayCopier.field2490 * -168449264) + 0.5D); return var4 < 1 ? 1 : var4; } - @ObfuscatedName("al") + @ObfuscatedName("am") @ObfuscatedSignature( - signature = "(Lge;B)I", - garbageValue = "7" + signature = "(Lgl;I)I", + garbageValue = "623001818" ) - int method3793(MusicPatchNode var1) { - MusicPatchNode2 var2 = var1.field2448; - int var3 = this.field2442[var1.field2449] * this.field2437[var1.field2449] + 4096 >> 13; + int method3719(MusicPatchNode var1) { + MusicPatchNode2 var2 = var1.field2430; + int var3 = this.field2405[var1.field2444] * this.field2408[var1.field2444] + 4096 >> 13; var3 = var3 * var3 + 16384 >> 15; - var3 = var3 * var1.field2451 + 16384 >> 15; - var3 = var3 * this.field2417 + 128 >> 8; - if (var2.field2400 > 0) { - var3 = (int)((double)var3 * Math.pow(0.5D, 1.953125E-5D * (double)var1.field2456 * (double)var2.field2400) + 0.5D); + var3 = var3 * var1.field2433 + 16384 >> 15; + var3 = var3 * this.field2401 + 128 >> 8; + if (var2.field2378 > 0) { + var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.field2378 * 1.953125E-5D * (double)(var1.field2446 * 128)) + 0.5D); } int var4; int var5; int var6; int var7; - if (var2.field2404 != null) { - var4 = var1.field2457; - var5 = var2.field2404[var1.field2458 * 4 + 1]; - if (var1.field2458 * 4 < var2.field2404.length - 2) { - var6 = (var2.field2404[var1.field2458 * 4] & 255) << 8; - var7 = (var2.field2404[var1.field2458 * 4 + 2] & 255) << 8; - var5 += (var2.field2404[var1.field2458 * 4 + 3] - var5) * (var4 - var6) / (var7 - var6); + if (var2.field2385 != null) { + var4 = var1.field2439; + var5 = var2.field2385[var1.field2440 * 4 + 1]; + if (var1.field2440 * 4 < var2.field2385.length - 2) { + var6 = (var2.field2385[var1.field2440 * 4] & 255) << 8; + var7 = (var2.field2385[var1.field2440 * 4 + 2] & 255) << 8; + var5 += (var2.field2385[var1.field2440 * 4 + 3] - var5) * (var4 - var6) / (var7 - var6); } var3 = var5 * var3 + 32 >> 6; } - if (var1.field2459 > 0 && var2.field2399 != null) { - var4 = var1.field2459; - var5 = var2.field2399[var1.field2460 * 4 + 1]; - if (var1.field2460 * 4 < var2.field2399.length - 2) { - var6 = (var2.field2399[var1.field2460 * 4] & 255) << 8; - var7 = (var2.field2399[var1.field2460 * 4 + 2] & 255) << 8; - var5 += (var2.field2399[var1.field2460 * 4 + 3] - var5) * (var4 - var6) / (var7 - var6); + if (var1.field2441 > 0 && var2.field2377 != null) { + var4 = var1.field2441; + var5 = var2.field2377[var1.field2438 * 4 + 1]; + if (var1.field2438 * 4 < var2.field2377.length - 2) { + var6 = (var2.field2377[var1.field2438 * 4] & 255) << 8; + var7 = (var2.field2377[var1.field2438 * 4 + 2] & 255) << 8; + var5 += (var4 - var6) * (var2.field2377[var1.field2438 * 4 + 3] - var5) / (var7 - var6); } - var3 = var5 * var3 + 32 >> 6; + var3 = var3 * var5 + 32 >> 6; } return var3; } - @ObfuscatedName("ay") + @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "(Lge;I)I", - garbageValue = "1924101342" + signature = "(Lgl;I)I", + garbageValue = "1450694998" ) - int method3794(MusicPatchNode var1) { - int var2 = this.field2420[var1.field2449]; - return var2 < 8192 ? var2 * var1.field2452 + 32 >> 6 : 16384 - ((128 - var1.field2452) * (16384 - var2) + 32 >> 6); + int method3720(MusicPatchNode var1) { + int var2 = this.field2404[var1.field2444]; + return var2 < 8192 ? var2 * var1.field2442 + 32 >> 6 : 16384 - ((128 - var1.field2442) * (16384 - var2) + 32 >> 6); } - @ObfuscatedName("ax") + @ObfuscatedName("bj") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "869204676" + garbageValue = "-796746518" ) - void method3800() { + void method3726() { int var1 = this.track; int var2 = this.trackLength; long var3; - for (var3 = this.field2416; var2 == this.trackLength; var3 = this.midiFile.method3906(var2)) { + for (var3 = this.field2400; var2 == this.trackLength; var3 = this.midiFile.method3829(var2)) { while (var2 == this.midiFile.trackLengths[var1]) { this.midiFile.gotoTrack(var1); int var5 = this.midiFile.readMessage(var1); @@ -936,8 +937,8 @@ public class MidiPcmStream extends PcmStream { this.midiFile.setTrackDone(); this.midiFile.markTrackPosition(var1); if (this.midiFile.isDone()) { - if (!this.field2426 || var2 == 0) { - this.method3787(); + if (!this.field2403 || var2 == 0) { + this.method3713(); this.midiFile.clear(); return; } @@ -948,7 +949,7 @@ public class MidiPcmStream extends PcmStream { } if ((var5 & 128) != 0) { - this.method3770(var5); + this.method3697(var5); } this.midiFile.readTrackLength(var1); @@ -961,20 +962,20 @@ public class MidiPcmStream extends PcmStream { this.track = var1; this.trackLength = var2; - this.field2416 = var3; + this.field2400 = var3; } - @ObfuscatedName("au") + @ObfuscatedName("bg") @ObfuscatedSignature( - signature = "(Lge;B)Z", - garbageValue = "0" + signature = "(Lgl;B)Z", + garbageValue = "26" ) - boolean method3801(MusicPatchNode var1) { + boolean method3767(MusicPatchNode var1) { if (var1.stream == null) { - if (var1.field2459 >= 0) { + if (var1.field2441 >= 0) { var1.remove(); - if (var1.field2445 > 0 && var1 == this.field2435[var1.field2449][var1.field2445]) { - this.field2435[var1.field2449][var1.field2445] = null; + if (var1.field2436 > 0 && var1 == this.field2419[var1.field2444][var1.field2436]) { + this.field2419[var1.field2444][var1.field2436] = null; } } @@ -984,103 +985,669 @@ public class MidiPcmStream extends PcmStream { } } - @ObfuscatedName("as") + @ObfuscatedName("bw") @ObfuscatedSignature( - signature = "(Lge;[IIII)Z", - garbageValue = "178317578" + signature = "(Lgl;[IIII)Z", + garbageValue = "1744795521" ) - boolean method3802(MusicPatchNode var1, int[] var2, int var3, int var4) { - var1.field2464 = Messages.PcmPlayer_sampleRate / 100; - if (var1.field2459 < 0 || var1.stream != null && !var1.stream.method2585()) { - int var5 = var1.field2455; + boolean method3728(MusicPatchNode var1, int[] var2, int var3, int var4) { + var1.field2431 = DirectByteArrayCopier.field2490 * -168449264 / 100; + if (var1.field2441 < 0 || var1.stream != null && !var1.stream.method2653()) { + int var5 = var1.field2437; if (var5 > 0) { - var5 -= (int)(16.0D * Math.pow(2.0D, (double)this.field2427[var1.field2449] * 4.921259842519685E-4D) + 0.5D); + var5 -= (int)(16.0D * Math.pow(2.0D, (double)this.field2411[var1.field2444] * 4.921259842519685E-4D) + 0.5D); if (var5 < 0) { var5 = 0; } - var1.field2455 = var5; + var1.field2437 = var5; } - var1.stream.method2679(this.method3862(var1)); - MusicPatchNode2 var6 = var1.field2448; + var1.stream.method2615(this.method3736(var1)); + MusicPatchNode2 var6 = var1.field2430; boolean var7 = false; - ++var1.field2461; - var1.field2462 += var6.field2405; - double var8 = 5.086263020833333E-6D * (double)((var1.field2450 - 60 << 8) + (var1.field2454 * var1.field2455 >> 12)); - if (var6.field2400 > 0) { - if (var6.field2403 > 0) { - var1.field2456 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2403 * var8) + 0.5D); + ++var1.field2443; + var1.field2427 += var6.field2383; + double var8 = 5.086263020833333E-6D * (double)((var1.field2432 - 60 << 8) + (var1.field2434 * var1.field2437 >> 12)); + if (var6.field2378 > 0) { + if (var6.field2384 > 0) { + var1.field2446 = var1.field2446 * 29114368 + (int)(128.0D * Math.pow(2.0D, (double)var6.field2384 * var8) + 0.5D) * 1845721216; } else { - var1.field2456 += 128; + var1.field2446 = var1.field2446 * 29114368 + 29114368; } } - if (var6.field2404 != null) { - if (var6.field2398 > 0) { - var1.field2457 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2398) + 0.5D); + if (var6.field2385 != null) { + if (var6.field2387 > 0) { + var1.field2439 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2387 * var8) + 0.5D); } else { - var1.field2457 += 128; + var1.field2439 += 128; } - while (var1.field2458 * 4 < var6.field2404.length - 2 && var1.field2457 > (var6.field2404[var1.field2458 * 4 + 2] & 255) << 8) { - var1.field2458 = var1.field2458 * 4 + 2; + while (var1.field2440 * 4 < var6.field2385.length - 2 && var1.field2439 > (var6.field2385[var1.field2440 * 4 + 2] & 255) << 8) { + var1.field2440 = var1.field2440 * 4 + 2; } - if (var1.field2458 * 4 == var6.field2404.length - 2 && var6.field2404[var1.field2458 * 4 + 1] == 0) { + if (var1.field2440 * 4 == var6.field2385.length - 2 && var6.field2385[var1.field2440 * 4 + 1] == 0) { var7 = true; } } - if (var1.field2459 >= 0 && var6.field2399 != null && (this.field2428[var1.field2449] & 1) == 0 && (var1.field2445 < 0 || var1 != this.field2435[var1.field2449][var1.field2445])) { - if (var6.field2407 > 0) { - var1.field2459 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2407 * var8) + 0.5D); + if (var1.field2441 >= 0 && var6.field2377 != null && (this.field2412[var1.field2444] & 1) == 0 && (var1.field2436 < 0 || var1 != this.field2419[var1.field2444][var1.field2436])) { + if (var6.field2376 > 0) { + var1.field2441 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2376) + 0.5D); } else { - var1.field2459 += 128; + var1.field2441 += 128; } - while (var1.field2460 * 4 < var6.field2399.length - 2 && var1.field2459 > (var6.field2399[var1.field2460 * 4 + 2] & 255) << 8) { - var1.field2460 = var1.field2460 * 4 + 2; + while (var1.field2438 * 4 < var6.field2377.length - 2 && var1.field2441 > (var6.field2377[var1.field2438 * 4 + 2] & 255) << 8) { + var1.field2438 = var1.field2438 * 4 + 2; } - if (var1.field2460 * 4 == var6.field2399.length - 2) { + if (var1.field2438 * 4 == var6.field2377.length - 2) { var7 = true; } } if (var7) { - var1.stream.method2582(var1.field2464); + var1.stream.method2559(var1.field2431); if (var2 != null) { var1.stream.fill(var2, var3, var4); } else { var1.stream.skip(var4); } - if (var1.stream.method2686()) { + if (var1.stream.method2563()) { this.patchStream.mixer.addSubStream(var1.stream); } - var1.method3893(); - if (var1.field2459 >= 0) { + var1.method3809(); + if (var1.field2441 >= 0) { var1.remove(); - if (var1.field2445 > 0 && var1 == this.field2435[var1.field2449][var1.field2445]) { - this.field2435[var1.field2449][var1.field2445] = null; + if (var1.field2436 > 0 && var1 == this.field2419[var1.field2444][var1.field2436]) { + this.field2419[var1.field2444][var1.field2436] = null; } } return true; } else { - var1.stream.method2581(var1.field2464, this.method3793(var1), this.method3794(var1)); + var1.stream.method2668(var1.field2431, this.method3719(var1), this.method3720(var1)); return false; } } else { - var1.method3893(); + var1.method3809(); var1.remove(); - if (var1.field2445 > 0 && var1 == this.field2435[var1.field2449][var1.field2445]) { - this.field2435[var1.field2449][var1.field2445] = null; + if (var1.field2436 > 0 && var1 == this.field2419[var1.field2444][var1.field2436]) { + this.field2419[var1.field2444][var1.field2436] = null; } return true; } } + + @ObfuscatedName("b") + @ObfuscatedSignature( + signature = "(ILcu;ZB)I", + garbageValue = "-120" + ) + static int method3737(int var0, Script var1, boolean var2) { + int var4 = -1; + Widget var3; + if (var0 >= 2000) { + var0 -= 1000; + var4 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + var3 = Tile.getWidget(var4); + } else { + var3 = var2 ? UserComparator7.field1946 : class197.field2398; + } + + if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { + class188.Interpreter_intStackSize -= 2; + var3.scrollX = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + if (var3.scrollX > var3.scrollWidth - var3.width) { + var3.scrollX = var3.scrollWidth - var3.width; + } + + if (var3.scrollX < 0) { + var3.scrollX = 0; + } + + var3.scrollY = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + if (var3.scrollY > var3.scrollHeight - var3.height) { + var3.scrollY = var3.scrollHeight - var3.height; + } + + if (var3.scrollY < 0) { + var3.scrollY = 0; + } + + LoginPacket.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { + var3.color = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + LoginPacket.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETFILL) { + var3.fill = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + LoginPacket.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTRANS) { + var3.transparencyTop = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + LoginPacket.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { + var3.lineWid = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + LoginPacket.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { + var3.spriteId2 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + LoginPacket.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { + var3.spriteAngle = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + LoginPacket.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTILING) { + var3.spriteTiling = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + LoginPacket.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETMODEL) { + var3.modelType = 1; + var3.modelId = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + LoginPacket.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { + class188.Interpreter_intStackSize -= 6; + var3.modelOffsetX = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var3.modelOffsetY = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + var3.modelAngleX = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 2]; + var3.modelAngleY = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 3]; + var3.modelAngleZ = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 4]; + var3.modelZoom = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 5]; + LoginPacket.invalidateWidget(var3); + return 1; + } else { + int var8; + if (var0 == ScriptOpcodes.CC_SETMODELANIM) { + var8 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + if (var8 != var3.sequenceId) { + var3.sequenceId = var8; + var3.modelFrame = 0; + var3.modelFrameCycle = 0; + LoginPacket.invalidateWidget(var3); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { + var3.modelOrthog = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + LoginPacket.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTEXT) { + String var7 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + if (!var7.equals(var3.text)) { + var3.text = var7; + LoginPacket.invalidateWidget(var3); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { + var3.fontId = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + LoginPacket.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { + class188.Interpreter_intStackSize -= 3; + var3.textXAlignment = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var3.textYAlignment = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + var3.textLineHeight = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 2]; + LoginPacket.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { + var3.textShadowed = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + LoginPacket.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { + var3.outline = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + LoginPacket.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { + var3.spriteShadow = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + LoginPacket.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { + var3.spriteFlipV = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + LoginPacket.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { + var3.spriteFlipH = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + LoginPacket.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { + class188.Interpreter_intStackSize -= 2; + var3.scrollWidth = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var3.scrollHeight = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + LoginPacket.invalidateWidget(var3); + if (var4 != -1 && var3.type == 0) { + Messages.revalidateWidgetScroll(UserComparator7.Widget_interfaceComponents[var4 >> 16], var3, false); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { + WorldMapRectangle.resumePauseWidget(var3.id, var3.childIndex); + Client.meslayerContinueWidget = var3; + LoginPacket.invalidateWidget(var3); + return 1; + } else if (var0 == 1122) { + var3.spriteId = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + LoginPacket.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { + var3.color2 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + LoginPacket.invalidateWidget(var3); + return 1; + } else if (var0 == 1124) { + var3.transparencyBot = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + LoginPacket.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETFILLMODE) { + var8 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + FillMode var6 = (FillMode)DynamicObject.findEnumerated(ModelData0.FillMode_values(), var8); + if (var6 != null) { + var3.fillMode = var6; + LoginPacket.invalidateWidget(var3); + } + + return 1; + } else { + boolean var5; + if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { + var5 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + var3.field2676 = var5; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { + var5 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + var3.modelTransparency = var5; + return 1; + } else { + return 2; + } + } + } + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(Lko;Lko;Lko;I)V", + garbageValue = "702202184" + ) + @Export("drawTitle") + static void drawTitle(Font var0, Font var1, Font var2) { + Login.xPadding = (GrandExchangeOfferTotalQuantityComparator.canvasWidth - 765) / 2; + Login.loginBoxX = Login.xPadding + 202; + Script.loginBoxCenter = Login.loginBoxX + 180; + if (Login.worldSelectOpen) { + class42.method781(var0, var1); + } else { + UrlRequest.leftTitleSprite.drawAt(Login.xPadding, 0); + ScriptFrame.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); + int var4; + if (Client.gameState == 0 || Client.gameState == 5) { + byte var3 = 20; + var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); + var4 = 253 - var3; + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); + var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); + } + + String var6; + String var7; + String var8; + short var27; + int var28; + short var29; + if (Client.gameState == 20) { + Login.titleboxSprite.drawAt(Login.loginBoxX + 180 - Login.titleboxSprite.subWidth / 2, 271 - Login.titleboxSprite.subHeight / 2); + var27 = 201; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var27, 16776960, 0); + var28 = var27 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var28, 16776960, 0); + var28 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var28, 16776960, 0); + var28 += 15; + var28 += 7; + if (Login.loginIndex != 4) { + var0.draw("Login: ", Login.loginBoxX + 180 - 110, var28, 16777215, 0); + var29 = 200; + if (Interpreter.clientPreferences.hideUsername) { + var8 = Login.Login_username; + var7 = UserComparator6.method3370('*', var8.length()); + var6 = var7; + } else { + var6 = Login.Login_username; + } + + for (var6 = var6; var0.stringWidth(var6) > var29; var6 = var6.substring(0, var6.length() - 1)) { + } + + var0.draw(AbstractFont.escapeBrackets(var6), Login.loginBoxX + 180 - 70, var28, 16777215, 0); + var28 += 15; + var8 = Login.Login_password; + var7 = UserComparator6.method3370('*', var8.length()); + + String var9; + for (var9 = var7; var0.stringWidth(var9) > var29; var9 = var9.substring(1)) { + } + + var0.draw("Password: " + var9, Login.loginBoxX + 180 - 108, var28, 16777215, 0); + var28 += 15; + } + } + + if (Client.gameState == 10 || Client.gameState == 11) { + Login.titleboxSprite.drawAt(Login.loginBoxX, 171); + short var18; + if (Login.loginIndex == 0) { + var27 = 251; + var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var27, 16776960, 0); + var28 = var27 + 30; + var4 = Login.loginBoxX + 180 - 80; + var18 = 291; + Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var0.drawLines("New User", var4 - 73, var18 - 20, 144, 40, 16777215, 0, 1, 1, 0); + var4 = Login.loginBoxX + 180 + 80; + Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var0.drawLines("Existing User", var4 - 73, var18 - 20, 144, 40, 16777215, 0, 1, 1, 0); + } else if (Login.loginIndex == 1) { + var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); + var27 = 236; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var27, 16777215, 0); + var28 = var27 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var28, 16777215, 0); + var28 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var28, 16777215, 0); + var28 += 15; + var4 = Login.loginBoxX + 180 - 80; + var18 = 321; + Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var0.drawCentered("Continue", var4, var18 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180 + 80; + Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var0.drawCentered("Cancel", var4, var18 + 5, 16777215, 0); + } else { + String var5; + int var21; + if (Login.loginIndex == 2) { + var27 = 201; + var0.drawCentered(Login.Login_response1, Script.loginBoxCenter, var27, 16776960, 0); + var28 = var27 + 15; + var0.drawCentered(Login.Login_response2, Script.loginBoxCenter, var28, 16776960, 0); + var28 += 15; + var0.drawCentered(Login.Login_response3, Script.loginBoxCenter, var28, 16776960, 0); + var28 += 15; + var28 += 7; + var0.draw("Login: ", Script.loginBoxCenter - 110, var28, 16777215, 0); + var29 = 200; + var5 = Interpreter.clientPreferences.hideUsername ? StructDefinition.method4551(Login.Login_username) : Login.Login_username; + + for (var6 = var5; var0.stringWidth(var6) > var29; var6 = var6.substring(1)) { + } + + var0.draw(AbstractFont.escapeBrackets(var6) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? NPC.colorStartTag(16776960) + "|" : ""), Script.loginBoxCenter - 70, var28, 16777215, 0); + var28 += 15; + + for (var7 = StructDefinition.method4551(Login.Login_password); var0.stringWidth(var7) > var29; var7 = var7.substring(1)) { + } + + var0.draw("Password: " + var7 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? NPC.colorStartTag(16776960) + "|" : ""), Script.loginBoxCenter - 108, var28, 16777215, 0); + var28 += 15; + var27 = 277; + var21 = Script.loginBoxCenter + -117; + boolean var10 = Client.Login_isUsernameRemembered; + boolean var11 = Login.field1186; + IndexedSprite var30 = var10 ? (var11 ? Login.field1162 : Login.options_buttons_2Sprite) : (var11 ? GrandExchangeOffer.field64 : class218.options_buttons_0Sprite); + var30.drawAt(var21, var27); + var21 = var21 + var30.subWidth + 5; + var1.draw("Remember username", var21, var27 + 13, 16776960, 0); + var21 = Script.loginBoxCenter + 24; + boolean var14 = Interpreter.clientPreferences.hideUsername; + boolean var15 = Login.field1182; + IndexedSprite var13 = var14 ? (var15 ? Login.field1162 : Login.options_buttons_2Sprite) : (var15 ? GrandExchangeOffer.field64 : class218.options_buttons_0Sprite); + var13.drawAt(var21, var27); + var21 = var21 + var13.subWidth + 5; + var1.draw("Hide username", var21, var27 + 13, 16776960, 0); + var28 = var27 + 15; + int var16 = Script.loginBoxCenter - 80; + short var17 = 321; + Login.titlebuttonSprite.drawAt(var16 - 73, var17 - 20); + var0.drawCentered("Login", var16, var17 + 5, 16777215, 0); + var16 = Script.loginBoxCenter + 80; + Login.titlebuttonSprite.drawAt(var16 - 73, var17 - 20); + var0.drawCentered("Cancel", var16, var17 + 5, 16777215, 0); + var27 = 357; + switch(Login.field1181) { + case 2: + DevicePcmPlayerProvider.field391 = "Having trouble logging in?"; + break; + default: + DevicePcmPlayerProvider.field391 = "Can't login? Click here."; + } + + class267.field3521 = new Bounds(Script.loginBoxCenter, var27, var1.stringWidth(DevicePcmPlayerProvider.field391), 11); + class197.field2397 = new Bounds(Script.loginBoxCenter, var27, var1.stringWidth("Still having trouble logging in?"), 11); + var1.drawCentered(DevicePcmPlayerProvider.field391, Script.loginBoxCenter, var27, 16777215, 0); + } else if (Login.loginIndex == 3) { + var27 = 201; + var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var27, 16776960, 0); + var28 = var27 + 20; + var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var28, 16776960, 0); + var28 += 15; + var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var28, 16776960, 0); + var28 += 15; + var4 = Login.loginBoxX + 180; + var18 = 276; + Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var2.drawCentered("Try again", var4, var18 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180; + var18 = 326; + Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var2.drawCentered("Forgotten password?", var4, var18 + 5, 16777215, 0); + } else if (Login.loginIndex == 4) { + var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); + var27 = 236; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var27, 16777215, 0); + var28 = var27 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var28, 16777215, 0); + var28 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var28, 16777215, 0); + var28 += 15; + var5 = "PIN: "; + var7 = class80.otp; + var6 = UserComparator6.method3370('*', var7.length()); + var0.draw(var5 + var6 + (Client.cycle % 40 < 20 ? NPC.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var28, 16777215, 0); + var28 -= 8; + var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var28, 16776960, 0); + var28 += 15; + var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var28, 16776960, 0); + var21 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; + int var23 = var28 - var0.ascent; + IndexedSprite var24; + if (Login.field1178) { + var24 = Login.options_buttons_2Sprite; + } else { + var24 = class218.options_buttons_0Sprite; + } + + var24.drawAt(var21, var23); + var28 += 15; + int var31 = Login.loginBoxX + 180 - 80; + short var25 = 321; + Login.titlebuttonSprite.drawAt(var31 - 73, var25 - 20); + var0.drawCentered("Continue", var31, var25 + 5, 16777215, 0); + var31 = Login.loginBoxX + 180 + 80; + Login.titlebuttonSprite.drawAt(var31 - 73, var25 - 20); + var0.drawCentered("Cancel", var31, var25 + 5, 16777215, 0); + var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var25 + 36, 255, 0); + } else { + int var26; + short var33; + if (Login.loginIndex == 5) { + var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); + var27 = 221; + var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var27, 16776960, 0); + var28 = var27 + 15; + var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var28, 16776960, 0); + var28 += 15; + var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var28, 16776960, 0); + var28 += 15; + var28 += 14; + var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var28, 16777215, 0); + var29 = 174; + if (Interpreter.clientPreferences.hideUsername) { + var8 = Login.Login_username; + var7 = UserComparator6.method3370('*', var8.length()); + var6 = var7; + } else { + var6 = Login.Login_username; + } + + for (var6 = var6; var0.stringWidth(var6) > var29; var6 = var6.substring(1)) { + } + + var0.draw(AbstractFont.escapeBrackets(var6) + (Client.cycle % 40 < 20 ? NPC.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var28, 16777215, 0); + var28 += 15; + var26 = Login.loginBoxX + 180 - 80; + var33 = 321; + Login.titlebuttonSprite.drawAt(var26 - 73, var33 - 20); + var0.drawCentered("Recover", var26, var33 + 5, 16777215, 0); + var26 = Login.loginBoxX + 180 + 80; + Login.titlebuttonSprite.drawAt(var26 - 73, var33 - 20); + var0.drawCentered("Back", var26, var33 + 5, 16777215, 0); + var33 = 356; + var1.drawCentered("Still having trouble logging in?", Script.loginBoxCenter, var33, 268435455, 0); + } else if (Login.loginIndex == 6) { + var27 = 201; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var27, 16776960, 0); + var28 = var27 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var28, 16776960, 0); + var28 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var28, 16776960, 0); + var28 += 15; + var4 = Login.loginBoxX + 180; + var18 = 321; + Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var0.drawCentered("Back", var4, var18 + 5, 16777215, 0); + } else if (Login.loginIndex == 7) { + var27 = 216; + var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var27, 16776960, 0); + var28 = var27 + 15; + var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var28, 16776960, 0); + var28 += 15; + var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var28, 16776960, 0); + var28 += 15; + var4 = Login.loginBoxX + 180 - 80; + var18 = 321; + Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var0.drawCentered("Set Date of Birth", var4, var18 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180 + 80; + Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var0.drawCentered("Back", var4, var18 + 5, 16777215, 0); + } else if (Login.loginIndex == 8) { + var27 = 216; + var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var27, 16776960, 0); + var28 = var27 + 15; + var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var28, 16776960, 0); + var28 += 15; + var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var28, 16776960, 0); + var28 += 15; + var4 = Login.loginBoxX + 180 - 80; + var18 = 321; + Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var0.drawCentered("Privacy Policy", var4, var18 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180 + 80; + Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var0.drawCentered("Back", var4, var18 + 5, 16777215, 0); + } else if (Login.loginIndex == 12) { + var27 = 201; + String var22 = ""; + var5 = ""; + var6 = ""; + switch(Login.field1167) { + case 0: + var22 = "Your account has been disabled."; + var5 = Strings.field2798; + var6 = ""; + break; + case 1: + var22 = "Account locked as we suspect it has been stolen."; + var5 = Strings.field2837; + var6 = ""; + break; + default: + ItemDefinition.Login_promptCredentials(false); + } + + var0.drawCentered(var22, Login.loginBoxX + 180, var27, 16776960, 0); + var28 = var27 + 15; + var2.drawCentered(var5, Login.loginBoxX + 180, var28, 16776960, 0); + var28 += 15; + var2.drawCentered(var6, Login.loginBoxX + 180, var28, 16776960, 0); + var28 += 15; + var26 = Login.loginBoxX + 180; + var33 = 276; + Login.titlebuttonSprite.drawAt(var26 - 73, var33 - 20); + var0.drawCentered("Support Page", var26, var33 + 5, 16777215, 0); + var26 = Login.loginBoxX + 180; + var33 = 326; + Login.titlebuttonSprite.drawAt(var26 - 73, var33 - 20); + var0.drawCentered("Back", var26, var33 + 5, 16777215, 0); + } else if (Login.loginIndex == 24) { + var27 = 221; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var27, 16777215, 0); + var28 = var27 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var28, 16777215, 0); + var28 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var28, 16777215, 0); + var28 += 15; + var4 = Login.loginBoxX + 180; + var18 = 301; + Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var0.drawCentered("Ok", var4, var18 + 5, 16777215, 0); + } + } + } + } + + if (Client.gameState >= 10) { + int[] var19 = new int[4]; + Rasterizer2D.Rasterizer2D_getClipArray(var19); + Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, AttackOption.canvasHeight); + StructDefinition.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); + StructDefinition.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); + Rasterizer2D.Rasterizer2D_setClipArray(var19); + } + + class30.title_muteSprite[Interpreter.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); + if (Client.gameState > 5 && Varps.clientLanguage == Language.Language_EN) { + if (class54.field483 != null) { + var28 = Login.xPadding + 5; + var29 = 463; + byte var32 = 100; + byte var20 = 35; + class54.field483.drawAt(var28, var29); + var0.drawCentered("World" + " " + Client.worldId, var32 / 2 + var28, var20 / 2 + var29 - 2, 16777215, 0); + if (Login.World_request != null) { + var1.drawCentered("Loading...", var32 / 2 + var28, var20 / 2 + var29 + 12, 16777215, 0); + } else { + var1.drawCentered("Click to switch", var32 / 2 + var28, var20 / 2 + var29 + 12, 16777215, 0); + } + } else { + class54.field483 = Canvas.SpriteBuffer_getIndexedSpriteByName(class3.archive8, "sl_button", ""); + } + } + + } + } } diff --git a/runescape-client/src/main/java/MilliClock.java b/runescape-client/src/main/java/MilliClock.java index 735625cd05..17039b622a 100644 --- a/runescape-client/src/main/java/MilliClock.java +++ b/runescape-client/src/main/java/MilliClock.java @@ -4,161 +4,143 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fi") +@ObfuscatedName("fy") @Implements("MilliClock") public class MilliClock extends Clock { - @ObfuscatedName("u") - long[] field2017; + @ObfuscatedName("oj") + @ObfuscatedSignature( + signature = "Lck;" + ) + @Export("varcs") + static Varcs varcs; + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "Lhz;" + ) + @Export("Widget_fontsArchive") + static AbstractArchive Widget_fontsArchive; @ObfuscatedName("f") + long[] field2005; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 90836153 + intValue = 1395433479 ) - int field2018; - @ObfuscatedName("b") + int field1999; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 878139607 + intValue = -814171189 ) - int field2019; - @ObfuscatedName("g") + int field1998; + @ObfuscatedName("w") @ObfuscatedGetter( - longValue = -4513558875816337439L + longValue = 7702672897497334159L ) - long field2022; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -1976068769 - ) - int field2021; + long field1996; @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1447162639 + intValue = 1971877303 ) - int field2020; + int field1997; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -1477924713 + ) + int field2001; - public MilliClock() { - this.field2017 = new long[10]; - this.field2018 = 256; - this.field2019 = 1; - this.field2021 = 0; - this.field2022 = TaskHandler.currentTimeMillis(); + MilliClock() { + this.field2005 = new long[10]; + this.field1999 = 256; + this.field1998 = 1; + this.field1997 = 0; + this.field1996 = WorldMapID.currentTimeMillis(); for (int var1 = 0; var1 < 10; ++var1) { - this.field2017[var1] = this.field2022; + this.field2005[var1] = this.field1996; } } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-26166053" + signature = "(B)V", + garbageValue = "4" ) @Export("mark") public void mark() { for (int var1 = 0; var1 < 10; ++var1) { - this.field2017[var1] = 0L; + this.field2005[var1] = 0L; } } + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(III)I", + garbageValue = "670539248" + ) + @Export("wait") + public int wait(int var1, int var2) { + int var3 = this.field1999; + int var4 = this.field1998; + this.field1999 = 300; + this.field1998 = 1; + this.field1996 = WorldMapID.currentTimeMillis(); + if (0L == this.field2005[this.field2001]) { + this.field1999 = var3; + this.field1998 = var4; + } else if (this.field1996 > this.field2005[this.field2001]) { + this.field1999 = (int)((long)(var1 * 2560) / (this.field1996 - this.field2005[this.field2001])); + } + + if (this.field1999 < 25) { + this.field1999 = 25; + } + + if (this.field1999 > 256) { + this.field1999 = 256; + this.field1998 = (int)((long)var1 - (this.field1996 - this.field2005[this.field2001]) / 10L); + } + + if (this.field1998 > var1) { + this.field1998 = var1; + } + + this.field2005[this.field2001] = this.field1996; + this.field2001 = (this.field2001 + 1) % 10; + int var5; + if (this.field1998 > 1) { + for (var5 = 0; var5 < 10; ++var5) { + if (this.field2005[var5] != 0L) { + this.field2005[var5] += (long)this.field1998; + } + } + } + + if (this.field1998 < var2) { + this.field1998 = var2; + } + + ServerBuild.method4111((long)this.field1998); + + for (var5 = 0; this.field1997 < 256; this.field1997 += this.field1999) { + ++var5; + } + + this.field1997 &= 255; + return var5; + } + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "6" + signature = "(III)I", + garbageValue = "176449942" ) - @Export("wait") - public int wait(int var1, int var2) { - int var3 = this.field2018; - int var4 = this.field2019; - this.field2018 = 300; - this.field2019 = 1; - this.field2022 = TaskHandler.currentTimeMillis(); - if (0L == this.field2017[this.field2020]) { - this.field2018 = var3; - this.field2019 = var4; - } else if (this.field2022 > this.field2017[this.field2020]) { - this.field2018 = (int)((long)(var1 * 2560) / (this.field2022 - this.field2017[this.field2020])); + static int method3447(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; } - - if (this.field2018 < 25) { - this.field2018 = 25; - } - - if (this.field2018 > 256) { - this.field2018 = 256; - this.field2019 = (int)((long)var1 - (this.field2022 - this.field2017[this.field2020]) / 10L); - } - - if (this.field2019 > var1) { - this.field2019 = var1; - } - - this.field2017[this.field2020] = this.field2022; - this.field2020 = (this.field2020 + 1) % 10; - if (this.field2019 > 1) { - for (int var5 = 0; var5 < 10; ++var5) { - if (this.field2017[var5] != 0L) { - this.field2017[var5] += (long)this.field2019; - } - } - } - - if (this.field2019 < var2) { - this.field2019 = var2; - } - - long var10 = (long)this.field2019; - if (var10 > 0L) { - if (0L == var10 % 10L) { - long var7 = var10 - 1L; - - try { - Thread.sleep(var7); - } catch (InterruptedException var16) { - } - - try { - Thread.sleep(1L); - } catch (InterruptedException var15) { - } - } else { - try { - Thread.sleep(var10); - } catch (InterruptedException var14) { - } - } - } - - int var13; - for (var13 = 0; this.field2021 < 256; this.field2021 += this.field2018) { - ++var13; - } - - this.field2021 &= 255; - return var13; - } - - @ObfuscatedName("ip") - @ObfuscatedSignature( - signature = "([Lhl;Lhl;ZB)V", - garbageValue = "115" - ) - @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; - class225.resizeInterface(var0, var1.id, var3, var4, var2); - if (var1.children != null) { - class225.resizeInterface(var1.children, var1.id, var3, var4, var2); - } - - InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); - if (var5 != null) { - WorldMapSectionType.method272(var5.group, var3, var4, var2); - } - - if (var1.contentType == 1337) { - } - } } diff --git a/runescape-client/src/main/java/Model.java b/runescape-client/src/main/java/Model.java index e80cad8b66..797228b5c8 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("df") +@ObfuscatedName("dw") @Implements("Model") public class Model extends Entity { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Ldf;" + signature = "Ldw;" ) @Export("Model_sharedSequenceModel") static Model Model_sharedSequenceModel; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("Model_sharedSequenceModelFaceAlphas") static byte[] Model_sharedSequenceModelFaceAlphas; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Ldf;" + signature = "Ldw;" ) @Export("Model_sharedSpotAnimationModel") static Model Model_sharedSpotAnimationModel; - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("Model_sharedSpotAnimationModelFaceAlphas") static byte[] Model_sharedSpotAnimationModelFaceAlphas; + @ObfuscatedName("ag") + static boolean[] field1657; @ObfuscatedName("ac") - static boolean[] field1698; - @ObfuscatedName("az") - static boolean[] field1706; - @ObfuscatedName("at") + static boolean[] field1683; + @ObfuscatedName("al") @Export("modelViewportXs") static int[] modelViewportXs; @ObfuscatedName("ae") @Export("modelViewportYs") static int[] modelViewportYs; + @ObfuscatedName("ad") + static int[] field1710; @ObfuscatedName("aj") - static int[] field1681; - @ObfuscatedName("ap") - static int[] field1703; - @ObfuscatedName("an") - static int[] field1699; - @ObfuscatedName("al") - static int[] field1673; + static int[] field1670; @ObfuscatedName("ax") - static int[] field1684; - @ObfuscatedName("au") - static int[][] field1708; - @ObfuscatedName("as") - static int[] field1709; - @ObfuscatedName("ah") - static int[][] field1710; - @ObfuscatedName("bi") - static int[] field1724; - @ObfuscatedName("bo") - static int[] field1712; - @ObfuscatedName("bx") - static int[] field1713; - @ObfuscatedName("bu") - static int[] field1714; - @ObfuscatedName("bd") - static int[] field1715; - @ObfuscatedName("bn") - static int[] field1707; + static int[] field1691; + @ObfuscatedName("at") + static int[] field1689; + @ObfuscatedName("ap") + static int[] field1651; + @ObfuscatedName("ai") + static int[][] field1692; + @ObfuscatedName("am") + static int[] field1705; + @ObfuscatedName("ab") + static int[][] field1694; @ObfuscatedName("bj") + static int[] field1695; + @ObfuscatedName("bg") + static int[] field1696; + @ObfuscatedName("bw") + static int[] field1697; + @ObfuscatedName("bk") + static int[] field1698; + @ObfuscatedName("bl") + static int[] field1699; + @ObfuscatedName("bq") + static int[] field1700; + @ObfuscatedName("bx") @Export("Model_transformTempX") static int Model_transformTempX; - @ObfuscatedName("bm") + @ObfuscatedName("bc") @Export("Model_transformTempY") static int Model_transformTempY; - @ObfuscatedName("bq") + @ObfuscatedName("by") @Export("Model_transformTempZ") static int Model_transformTempZ; - @ObfuscatedName("bf") - static boolean field1720; - @ObfuscatedName("ba") + @ObfuscatedName("bz") + static boolean field1704; + @ObfuscatedName("bs") @Export("Model_sine") static int[] Model_sine; - @ObfuscatedName("bb") + @ObfuscatedName("ba") @Export("Model_cosine") static int[] Model_cosine; - @ObfuscatedName("bg") - static int[] field1725; - @ObfuscatedName("bw") - static int[] field1726; - @ObfuscatedName("z") + @ObfuscatedName("bn") + static int[] field1709; + @ObfuscatedName("bb") + static int[] field1675; + @ObfuscatedName("p") @Export("verticesCount") int verticesCount; - @ObfuscatedName("p") + @ObfuscatedName("b") @Export("verticesX") int[] verticesX; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("verticesY") int[] verticesY; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("w") + @ObfuscatedName("a") @Export("indicesCount") int indicesCount; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("indices1") int[] indices1; - @ObfuscatedName("k") + @ObfuscatedName("c") @Export("indices2") int[] indices2; - @ObfuscatedName("x") + @ObfuscatedName("o") @Export("indices3") int[] indices3; - @ObfuscatedName("o") + @ObfuscatedName("v") @Export("faceColors1") int[] faceColors1; - @ObfuscatedName("e") + @ObfuscatedName("k") @Export("faceColors2") int[] faceColors2; - @ObfuscatedName("n") + @ObfuscatedName("s") @Export("faceColors3") int[] faceColors3; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("c") + @ObfuscatedName("t") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("a") - byte[] field1676; - @ObfuscatedName("d") + @ObfuscatedName("j") + byte[] field1703; + @ObfuscatedName("n") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("s") - byte field1678; - @ObfuscatedName("t") - int field1679; + @ObfuscatedName("u") + byte field1662; + @ObfuscatedName("z") + int field1688; + @ObfuscatedName("h") + int[] field1664; @ObfuscatedName("m") - int[] field1680; - @ObfuscatedName("v") - int[] field1705; - @ObfuscatedName("q") - int[] field1682; - @ObfuscatedName("l") + int[] field1665; + @ObfuscatedName("g") + int[] field1693; + @ObfuscatedName("r") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("j") + @ObfuscatedName("q") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("af") + @ObfuscatedName("aa") @Export("isSingleTile") public boolean isSingleTile; - @ObfuscatedName("ad") + @ObfuscatedName("av") @Export("boundsType") int boundsType; - @ObfuscatedName("am") + @ObfuscatedName("aw") @Export("bottomY") int bottomY; - @ObfuscatedName("ai") + @ObfuscatedName("as") @Export("xzRadius") int xzRadius; - @ObfuscatedName("ag") + @ObfuscatedName("ak") @Export("diameter") int diameter; - @ObfuscatedName("ao") + @ObfuscatedName("au") @Export("radius") int radius; - @ObfuscatedName("aw") + @ObfuscatedName("ah") @Export("xMid") int xMid; - @ObfuscatedName("ak") + @ObfuscatedName("aq") @Export("yMid") int yMid; - @ObfuscatedName("aa") + @ObfuscatedName("ao") @Export("zMid") int zMid; - @ObfuscatedName("ab") + @ObfuscatedName("an") @Export("xMidOffset") int xMidOffset; @ObfuscatedName("ar") @Export("yMidOffset") int yMidOffset; - @ObfuscatedName("av") + @ObfuscatedName("az") @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]; - field1698 = new boolean[4700]; - field1706 = new boolean[4700]; + field1657 = new boolean[4700]; + field1683 = new boolean[4700]; modelViewportXs = new int[4700]; modelViewportYs = new int[4700]; - field1681 = new int[4700]; - field1703 = new int[4700]; - field1699 = new int[4700]; - field1673 = new int[4700]; - field1684 = new int[1600]; - field1708 = new int[1600][512]; - field1709 = new int[12]; - field1710 = new int[12][2000]; - field1724 = new int[2000]; - field1712 = new int[2000]; - field1713 = new int[12]; - field1714 = new int[10]; - field1715 = new int[10]; - field1707 = new int[10]; - field1720 = true; + field1710 = new int[4700]; + field1670 = new int[4700]; + field1691 = new int[4700]; + field1689 = new int[4700]; + field1651 = new int[1600]; + field1692 = new int[1600][512]; + field1705 = new int[12]; + field1694 = new int[12][2000]; + field1695 = new int[2000]; + field1696 = new int[2000]; + field1697 = new int[12]; + field1698 = new int[10]; + field1699 = new int[10]; + field1700 = new int[10]; + field1704 = true; Model_sine = Rasterizer3D.Rasterizer3D_sine; Model_cosine = Rasterizer3D.Rasterizer3D_cosine; - field1725 = Rasterizer3D.Rasterizer3D_colorPalette; - field1726 = Rasterizer3D.field1771; + field1709 = Rasterizer3D.Rasterizer3D_colorPalette; + field1675 = Rasterizer3D.field1760; } Model() { this.verticesCount = 0; this.indicesCount = 0; - this.field1678 = 0; - this.field1679 = 0; + this.field1662 = 0; + this.field1688 = 0; this.isSingleTile = false; this.xMidOffset = -1; this.yMidOffset = -1; @@ -222,13 +222,13 @@ public class Model extends Entity { } @ObfuscatedSignature( - signature = "([Ldf;I)V" + signature = "([Ldw;I)V" ) public Model(Model[] var1, int var2) { this.verticesCount = 0; this.indicesCount = 0; - this.field1678 = 0; - this.field1679 = 0; + this.field1662 = 0; + this.field1688 = 0; this.isSingleTile = false; this.xMidOffset = -1; this.yMidOffset = -1; @@ -239,8 +239,8 @@ public class Model extends Entity { boolean var6 = false; this.verticesCount = 0; this.indicesCount = 0; - this.field1679 = 0; - this.field1678 = -1; + this.field1688 = 0; + this.field1662 = -1; int var7; Model var8; @@ -249,22 +249,22 @@ public class Model extends Entity { if (var8 != null) { this.verticesCount += var8.verticesCount; this.indicesCount += var8.indicesCount; - this.field1679 += var8.field1679; + this.field1688 += var8.field1688; if (var8.faceRenderPriorities != null) { var3 = true; } else { - if (this.field1678 == -1) { - this.field1678 = var8.field1678; + if (this.field1662 == -1) { + this.field1662 = var8.field1662; } - if (this.field1678 != var8.field1678) { + if (this.field1662 != var8.field1662) { var3 = true; } } var4 |= var8.faceAlphas != null; var5 |= var8.faceTextures != null; - var6 |= var8.field1676 != null; + var6 |= var8.field1703 != null; } } @@ -290,18 +290,18 @@ public class Model extends Entity { } if (var6) { - this.field1676 = new byte[this.indicesCount]; + this.field1703 = new byte[this.indicesCount]; } - if (this.field1679 > 0) { - this.field1680 = new int[this.field1679]; - this.field1705 = new int[this.field1679]; - this.field1682 = new int[this.field1679]; + if (this.field1688 > 0) { + this.field1664 = new int[this.field1688]; + this.field1665 = new int[this.field1688]; + this.field1693 = new int[this.field1688]; } this.verticesCount = 0; this.indicesCount = 0; - this.field1679 = 0; + this.field1688 = 0; for (var7 = 0; var7 < var2; ++var7) { var8 = var1[var7]; @@ -318,7 +318,7 @@ public class Model extends Entity { if (var8.faceRenderPriorities != null) { this.faceRenderPriorities[this.indicesCount] = var8.faceRenderPriorities[var9]; } else { - this.faceRenderPriorities[this.indicesCount] = var8.field1678; + this.faceRenderPriorities[this.indicesCount] = var8.field1662; } } @@ -335,21 +335,21 @@ public class Model extends Entity { } if (var6) { - if (var8.field1676 != null && var8.field1676[var9] != -1) { - this.field1676[this.indicesCount] = (byte)(this.field1679 + var8.field1676[var9]); + if (var8.field1703 != null && var8.field1703[var9] != -1) { + this.field1703[this.indicesCount] = (byte)(this.field1688 + var8.field1703[var9]); } else { - this.field1676[this.indicesCount] = -1; + this.field1703[this.indicesCount] = -1; } } ++this.indicesCount; } - for (var9 = 0; var9 < var8.field1679; ++var9) { - this.field1680[this.field1679] = this.verticesCount + var8.field1680[var9]; - this.field1705[this.field1679] = this.verticesCount + var8.field1705[var9]; - this.field1682[this.field1679] = this.verticesCount + var8.field1682[var9]; - ++this.field1679; + for (var9 = 0; var9 < var8.field1688; ++var9) { + this.field1664[this.field1688] = this.verticesCount + var8.field1664[var9]; + this.field1665[this.field1688] = this.verticesCount + var8.field1665[var9]; + this.field1693[this.field1688] = this.verticesCount + var8.field1693[var9]; + ++this.field1688; } for (var9 = 0; var9 < var8.verticesCount; ++var9) { @@ -363,9 +363,9 @@ public class Model extends Entity { } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "([[IIIIZI)Ldf;" + signature = "([[IIIIZI)Ldw;" ) @Export("contourGround") public Model contourGround(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { @@ -387,7 +387,7 @@ public class Model extends Entity { var11 = new Model(); var11.verticesCount = this.verticesCount; var11.indicesCount = this.indicesCount; - var11.field1679 = this.field1679; + var11.field1688 = this.field1688; var11.verticesX = this.verticesX; var11.verticesZ = this.verticesZ; var11.indices1 = this.indices1; @@ -398,12 +398,12 @@ public class Model extends Entity { var11.faceColors3 = this.faceColors3; var11.faceRenderPriorities = this.faceRenderPriorities; var11.faceAlphas = this.faceAlphas; - var11.field1676 = this.field1676; + var11.field1703 = this.field1703; var11.faceTextures = this.faceTextures; - var11.field1678 = this.field1678; - var11.field1680 = this.field1680; - var11.field1705 = this.field1705; - var11.field1682 = this.field1682; + var11.field1662 = this.field1662; + var11.field1664 = this.field1664; + var11.field1665 = this.field1665; + var11.field1693 = this.field1693; var11.vertexLabels = this.vertexLabels; var11.faceLabelsAlpha = this.faceLabelsAlpha; var11.isSingleTile = this.isSingleTile; @@ -461,9 +461,9 @@ public class Model extends Entity { } } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Z)Ldf;" + signature = "(Z)Ldw;" ) @Export("toSharedSequenceModel") public Model toSharedSequenceModel(boolean var1) { @@ -474,9 +474,9 @@ public class Model extends Entity { return this.buildSharedModel(var1, Model_sharedSequenceModel, Model_sharedSequenceModelFaceAlphas); } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Z)Ldf;" + signature = "(Z)Ldw;" ) @Export("toSharedSpotAnimationModel") public Model toSharedSpotAnimationModel(boolean var1) { @@ -487,15 +487,15 @@ public class Model extends Entity { return this.buildSharedModel(var1, Model_sharedSpotAnimationModel, Model_sharedSpotAnimationModelFaceAlphas); } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(ZLdf;[B)Ldf;" + signature = "(ZLdw;[B)Ldw;" ) @Export("buildSharedModel") Model buildSharedModel(boolean var1, Model var2, byte[] var3) { var2.verticesCount = this.verticesCount; var2.indicesCount = this.indicesCount; - var2.field1679 = this.field1679; + var2.field1688 = this.field1688; if (var2.verticesX == null || var2.verticesX.length < this.verticesCount) { var2.verticesX = new int[this.verticesCount + 100]; var2.verticesY = new int[this.verticesCount + 100]; @@ -531,12 +531,12 @@ public class Model extends Entity { var2.faceColors2 = this.faceColors2; var2.faceColors3 = this.faceColors3; var2.faceRenderPriorities = this.faceRenderPriorities; - var2.field1676 = this.field1676; + var2.field1703 = this.field1703; var2.faceTextures = this.faceTextures; - var2.field1678 = this.field1678; - var2.field1680 = this.field1680; - var2.field1705 = this.field1705; - var2.field1682 = this.field1682; + var2.field1662 = this.field1662; + var2.field1664 = this.field1664; + var2.field1665 = this.field1665; + var2.field1693 = this.field1693; var2.vertexLabels = this.vertexLabels; var2.faceLabelsAlpha = this.faceLabelsAlpha; var2.isSingleTile = this.isSingleTile; @@ -544,7 +544,7 @@ public class Model extends Entity { return var2; } - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("calculateBoundingBox") void calculateBoundingBox(int var1) { if (this.xMidOffset == -1) { @@ -558,9 +558,9 @@ public class Model extends Entity { int var9 = Model_sine[var1]; for (int var10 = 0; var10 < this.verticesCount; ++var10) { - int var11 = Rasterizer3D.method3039(this.verticesX[var10], this.verticesZ[var10], var8, var9); + int var11 = Rasterizer3D.method3015(this.verticesX[var10], this.verticesZ[var10], var8, var9); int var12 = this.verticesY[var10]; - int var13 = Rasterizer3D.method3081(this.verticesX[var10], this.verticesZ[var10], var8, var9); + int var13 = Rasterizer3D.method3016(this.verticesX[var10], this.verticesZ[var10], var8, var9); if (var11 < var2) { var2 = var11; } @@ -608,7 +608,7 @@ public class Model extends Entity { } } - @ObfuscatedName("p") + @ObfuscatedName("b") @Export("calculateBoundsCylinder") public void calculateBoundsCylinder() { if (this.boundsType != 1) { @@ -641,8 +641,8 @@ public class Model extends Entity { } } - @ObfuscatedName("h") - void method2960() { + @ObfuscatedName("e") + void method2906() { if (this.boundsType != 2) { this.boundsType = 2; this.xzRadius = 0; @@ -663,22 +663,22 @@ public class Model extends Entity { } } - @ObfuscatedName("y") - public int method2907() { + @ObfuscatedName("x") + public int method2893() { this.calculateBoundsCylinder(); return this.xzRadius; } - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("resetBounds") void resetBounds() { this.boundsType = 0; this.xMidOffset = -1; } - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ler;I)V" + signature = "(Leq;I)V" ) @Export("animate") public void animate(Frames var1, int var2) { @@ -700,9 +700,9 @@ public class Model extends Entity { } } - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Ler;ILer;I[I)V" + signature = "(Leq;ILeq;I[I)V" ) @Export("animate2") public void animate2(Frames var1, int var2, Frames var3, int var4, int[] var5) { @@ -752,7 +752,7 @@ public class Model extends Entity { } } - @ObfuscatedName("o") + @ObfuscatedName("l") @Export("transform") void transform(int var1, int[] var2, int var3, int var4, int var5) { int var6 = var2.length; @@ -920,7 +920,7 @@ public class Model extends Entity { } } - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("rotateY90Ccw") public void rotateY90Ccw() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { @@ -932,7 +932,7 @@ public class Model extends Entity { this.resetBounds(); } - @ObfuscatedName("n") + @ObfuscatedName("j") @Export("rotateY180") public void rotateY180() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { @@ -943,7 +943,7 @@ public class Model extends Entity { this.resetBounds(); } - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("rotateY270Ccw") public void rotateY270Ccw() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { @@ -955,7 +955,7 @@ public class Model extends Entity { this.resetBounds(); } - @ObfuscatedName("s") + @ObfuscatedName("u") @Export("rotateZ") public void rotateZ(int var1) { int var2 = Model_sine[var1]; @@ -970,7 +970,7 @@ public class Model extends Entity { this.resetBounds(); } - @ObfuscatedName("t") + @ObfuscatedName("z") @Export("offsetBy") public void offsetBy(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { @@ -985,7 +985,7 @@ public class Model extends Entity { this.resetBounds(); } - @ObfuscatedName("m") + @ObfuscatedName("h") @Export("scale") public void scale(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { @@ -997,11 +997,11 @@ public class Model extends Entity { this.resetBounds(); } - @ObfuscatedName("v") - public final void method2958(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - field1684[0] = -1; + @ObfuscatedName("m") + public final void method2907(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + field1651[0] = -1; if (this.boundsType != 2 && this.boundsType != 1) { - this.method2960(); + this.method2906(); } int var8 = Rasterizer3D.Rasterizer3D_clipMidX; @@ -1044,13 +1044,13 @@ public class Model extends Entity { var22 += var7; var23 = var21 * var17 - var22 * var16 >> 16; var22 = var21 * var16 + var22 * var17 >> 16; - field1681[var19] = var22 - var18; + field1710[var19] = var22 - var18; modelViewportXs[var19] = var20 * Rasterizer3D.Rasterizer3D_zoom / var22 + var8; modelViewportYs[var19] = var23 * Rasterizer3D.Rasterizer3D_zoom / var22 + var9; - if (this.field1679 > 0) { - field1703[var19] = var20; - field1699[var19] = var23; - field1673[var19] = var22; + if (this.field1688 > 0) { + field1670[var19] = var20; + field1691[var19] = var23; + field1689[var19] = var22; } } @@ -1061,11 +1061,11 @@ public class Model extends Entity { } - @ObfuscatedName("q") - public final void method2918(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - field1684[0] = -1; + @ObfuscatedName("aa") + public final void method2905(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + field1651[0] = -1; if (this.boundsType != 2 && this.boundsType != 1) { - this.method2960(); + this.method2906(); } int var9 = Rasterizer3D.Rasterizer3D_clipMidX; @@ -1108,13 +1108,13 @@ public class Model extends Entity { var23 += var7; var24 = var22 * var18 - var23 * var17 >> 16; var23 = var22 * var17 + var23 * var18 >> 16; - field1681[var20] = var23 - var19; + field1710[var20] = var23 - var19; modelViewportXs[var20] = var9 + var21 * Rasterizer3D.Rasterizer3D_zoom / var8; modelViewportYs[var20] = var10 + var24 * Rasterizer3D.Rasterizer3D_zoom / var8; - if (this.field1679 > 0) { - field1703[var20] = var21; - field1699[var20] = var24; - field1673[var20] = var23; + if (this.field1688 > 0) { + field1670[var20] = var21; + field1691[var20] = var24; + field1689[var20] = var23; } } @@ -1125,20 +1125,19 @@ public class Model extends Entity { } - @ObfuscatedName("l") + @ObfuscatedName("av") @Export("draw0") final void draw0(boolean var1, boolean var2, boolean var3, long var4) { if (this.diameter < 1600) { int var6; for (var6 = 0; var6 < this.diameter; ++var6) { - field1684[var6] = 0; + field1651[var6] = 0; } var6 = var3 ? 20 : 5; int var7; int var8; - int var9; int var10; int var11; int var12; @@ -1146,71 +1145,26 @@ public class Model extends Entity { int var15; int var16; int var18; + int var27; for (var7 = 0; var7 < this.indicesCount; ++var7) { if (this.faceColors3[var7] != -2) { var8 = this.indices1[var7]; - var9 = this.indices2[var7]; + var27 = this.indices2[var7]; var10 = this.indices3[var7]; var11 = modelViewportXs[var8]; - var12 = modelViewportXs[var9]; + 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[var9]; - 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; - } else { - var18 = ViewportMouse.ViewportMouse_x - var6; - if (var18 > var11 && var18 > var12 && var18 > var13) { - var34 = false; - } else { - var34 = true; - } - } - } - } - - if (var34) { - ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var4; - var2 = false; - } - } - - if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var9]) - (var13 - var12) * (modelViewportYs[var8] - modelViewportYs[var9]) > 0) { - field1706[var7] = false; - if (var11 >= 0 && var12 >= 0 && var13 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var13 <= Rasterizer3D.Rasterizer3D_clipWidth) { - field1698[var7] = false; - } else { - field1698[var7] = true; - } - - var14 = (field1681[var8] + field1681[var9] + field1681[var10]) / 3 + this.radius; - field1708[var14][field1684[var14]++] = var7; - } - } else { - var14 = field1703[var8]; - var15 = field1703[var9]; - var16 = field1703[var10]; - var17 = field1699[var8]; - var18 = field1699[var9]; - int var19 = field1699[var10]; - int var20 = field1673[var8]; - int var21 = field1673[var9]; - int var22 = field1673[var10]; + if (var1 && (var11 == -5000 || var12 == -5000 || var13 == -5000)) { + var14 = field1670[var8]; + var15 = field1670[var27]; + var16 = field1670[var10]; + int var17 = field1691[var8]; + var18 = field1691[var27]; + int var19 = field1691[var10]; + int var20 = field1689[var8]; + int var21 = field1689[var27]; + int var22 = field1689[var10]; var14 -= var15; var16 -= var15; var17 -= var18; @@ -1221,79 +1175,96 @@ public class Model extends Entity { int var24 = var20 * var16 - var14 * var22; int var25 = var14 * var19 - var17 * var16; if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { - field1706[var7] = true; - int var26 = (field1681[var8] + field1681[var9] + field1681[var10]) / 3 + this.radius; - field1708[var26][field1684[var26]++] = var7; + field1683[var7] = true; + int var26 = (field1710[var8] + field1710[var27] + field1710[var10]) / 3 + this.radius; + field1692[var26][field1651[var26]++] = var7; + } + } else { + if (var2 && WorldMapData_1.method699(modelViewportYs[var8], modelViewportYs[var27], modelViewportYs[var10], var11, var12, var13, var6)) { + ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var4; + var2 = false; + } + + if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var27]) - (var13 - var12) * (modelViewportYs[var8] - modelViewportYs[var27]) > 0) { + field1683[var7] = false; + if (var11 >= 0 && var12 >= 0 && var13 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var13 <= Rasterizer3D.Rasterizer3D_clipWidth) { + field1657[var7] = false; + } else { + field1657[var7] = true; + } + + var14 = (field1710[var8] + field1710[var27] + field1710[var10]) / 3 + this.radius; + field1692[var14][field1651[var14]++] = var7; } } } } - int[] var27; + int[] var9; if (this.faceRenderPriorities == null) { for (var7 = this.diameter - 1; var7 >= 0; --var7) { - var8 = field1684[var7]; + var8 = field1651[var7]; if (var8 > 0) { - var27 = field1708[var7]; + var9 = field1692[var7]; for (var10 = 0; var10 < var8; ++var10) { - this.method2972(var27[var10]); + this.method2926(var9[var10]); } } } } else { for (var7 = 0; var7 < 12; ++var7) { - field1709[var7] = 0; - field1713[var7] = 0; + field1705[var7] = 0; + field1697[var7] = 0; } for (var7 = this.diameter - 1; var7 >= 0; --var7) { - var8 = field1684[var7]; + var8 = field1651[var7]; if (var8 > 0) { - var27 = field1708[var7]; + var9 = field1692[var7]; for (var10 = 0; var10 < var8; ++var10) { - var11 = var27[var10]; + var11 = var9[var10]; byte var33 = this.faceRenderPriorities[var11]; - var13 = field1709[var33]++; - field1710[var33][var13] = var11; + var13 = field1705[var33]++; + field1694[var33][var13] = var11; if (var33 < 10) { - int[] var10000 = field1713; + int[] var10000 = field1697; var10000[var33] += var7; } else if (var33 == 10) { - field1724[var13] = var7; + field1695[var13] = var7; } else { - field1712[var13] = var7; + field1696[var13] = var7; } } } } var7 = 0; - if (field1709[1] > 0 || field1709[2] > 0) { - var7 = (field1713[1] + field1713[2]) / (field1709[1] + field1709[2]); + if (field1705[1] > 0 || field1705[2] > 0) { + var7 = (field1697[1] + field1697[2]) / (field1705[1] + field1705[2]); } var8 = 0; - if (field1709[3] > 0 || field1709[4] > 0) { - var8 = (field1713[3] + field1713[4]) / (field1709[3] + field1709[4]); + if (field1705[3] > 0 || field1705[4] > 0) { + var8 = (field1697[3] + field1697[4]) / (field1705[3] + field1705[4]); } - var9 = 0; - if (field1709[6] > 0 || field1709[8] > 0) { - var9 = (field1713[8] + field1713[6]) / (field1709[8] + field1709[6]); + var27 = 0; + if (field1705[6] > 0 || field1705[8] > 0) { + var27 = (field1697[8] + field1697[6]) / (field1705[8] + field1705[6]); } var11 = 0; - var12 = field1709[10]; - int[] var30 = field1710[10]; - int[] var31 = field1724; + var12 = field1705[10]; + int[] var30 = field1694[10]; + int[] var31 = field1695; if (var11 == var12) { var11 = 0; - var12 = field1709[11]; - var30 = field1710[11]; - var31 = field1712; + var12 = field1705[11]; + var30 = field1694[11]; + var31 = field1696; } if (var11 < var12) { @@ -1304,12 +1275,12 @@ public class Model extends Entity { for (var15 = 0; var15 < 10; ++var15) { while (var15 == 0 && var10 > var7) { - this.method2972(var30[var11++]); - if (var11 == var12 && var30 != field1710[11]) { + this.method2926(var30[var11++]); + if (var11 == var12 && var30 != field1694[11]) { var11 = 0; - var12 = field1709[11]; - var30 = field1710[11]; - var31 = field1712; + var12 = field1705[11]; + var30 = field1694[11]; + var31 = field1696; } if (var11 < var12) { @@ -1320,12 +1291,12 @@ public class Model extends Entity { } while (var15 == 3 && var10 > var8) { - this.method2972(var30[var11++]); - if (var11 == var12 && var30 != field1710[11]) { + this.method2926(var30[var11++]); + if (var11 == var12 && var30 != field1694[11]) { var11 = 0; - var12 = field1709[11]; - var30 = field1710[11]; - var31 = field1712; + var12 = field1705[11]; + var30 = field1694[11]; + var31 = field1696; } if (var11 < var12) { @@ -1335,13 +1306,13 @@ public class Model extends Entity { } } - while (var15 == 5 && var10 > var9) { - this.method2972(var30[var11++]); - if (var11 == var12 && var30 != field1710[11]) { + while (var15 == 5 && var10 > var27) { + this.method2926(var30[var11++]); + if (var11 == var12 && var30 != field1694[11]) { var11 = 0; - var12 = field1709[11]; - var30 = field1710[11]; - var31 = field1712; + var12 = field1705[11]; + var30 = field1694[11]; + var31 = field1696; } if (var11 < var12) { @@ -1351,21 +1322,21 @@ public class Model extends Entity { } } - var16 = field1709[var15]; - int[] var32 = field1710[var15]; + var16 = field1705[var15]; + int[] var32 = field1694[var15]; for (var18 = 0; var18 < var16; ++var18) { - this.method2972(var32[var18]); + this.method2926(var32[var18]); } } while (var10 != -1000) { - this.method2972(var30[var11++]); - if (var11 == var12 && var30 != field1710[11]) { + this.method2926(var30[var11++]); + if (var11 == var12 && var30 != field1694[11]) { var11 = 0; - var30 = field1710[11]; - var12 = field1709[11]; - var31 = field1712; + var30 = field1694[11]; + var12 = field1705[11]; + var31 = field1696; } if (var11 < var12) { @@ -1379,15 +1350,15 @@ public class Model extends Entity { } } - @ObfuscatedName("j") - final void method2972(int var1) { - if (field1706[var1]) { - this.method2925(var1); + @ObfuscatedName("aw") + final void method2926(int var1) { + if (field1683[var1]) { + this.method2909(var1); } else { int var2 = this.indices1[var1]; int var3 = this.indices2[var1]; int var4 = this.indices3[var1]; - Rasterizer3D.field1757 = field1698[var1]; + Rasterizer3D.field1751 = field1657[var1]; if (this.faceAlphas == null) { Rasterizer3D.Rasterizer3D_alpha = 0; } else { @@ -1398,11 +1369,11 @@ public class Model extends Entity { int var5; int var6; int var7; - if (this.field1676 != null && this.field1676[var1] != -1) { - int var8 = this.field1676[var1] & 255; - var5 = this.field1680[var8]; - var6 = this.field1705[var8]; - var7 = this.field1682[var8]; + if (this.field1703 != null && this.field1703[var1] != -1) { + int var8 = this.field1703[var1] & 255; + var5 = this.field1664[var8]; + var6 = this.field1665[var8]; + var7 = this.field1693[var8]; } else { var5 = var2; var6 = var3; @@ -1410,30 +1381,30 @@ public class Model extends Entity { } if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3034(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1703[var5], field1703[var6], field1703[var7], field1699[var5], field1699[var6], field1699[var7], field1673[var5], field1673[var6], field1673[var7], this.faceTextures[var1]); + Rasterizer3D.method3010(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1670[var5], field1670[var6], field1670[var7], field1691[var5], field1691[var6], field1691[var7], field1689[var5], field1689[var6], field1689[var7], this.faceTextures[var1]); } else { - Rasterizer3D.method3034(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field1703[var5], field1703[var6], field1703[var7], field1699[var5], field1699[var6], field1699[var7], field1673[var5], field1673[var6], field1673[var7], this.faceTextures[var1]); + Rasterizer3D.method3010(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field1670[var5], field1670[var6], field1670[var7], field1691[var5], field1691[var6], field1691[var7], field1689[var5], field1689[var6], field1689[var7], this.faceTextures[var1]); } } else if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3055(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field1725[this.faceColors1[var1]]); + Rasterizer3D.method3008(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field1709[this.faceColors1[var1]]); } else { - Rasterizer3D.method3030(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); + Rasterizer3D.method3000(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); } } } - @ObfuscatedName("ad") - final void method2925(int var1) { + @ObfuscatedName("as") + final void method2909(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 = field1673[var5]; - int var9 = field1673[var6]; - int var10 = field1673[var7]; + int var8 = field1689[var5]; + int var9 = field1689[var6]; + int var10 = field1689[var7]; if (this.faceAlphas == null) { Rasterizer3D.Rasterizer3D_alpha = 0; } else { @@ -1445,96 +1416,96 @@ public class Model extends Entity { int var13; int var14; if (var8 >= 50) { - field1714[var4] = modelViewportXs[var5]; - field1715[var4] = modelViewportYs[var5]; - field1707[var4++] = this.faceColors1[var1]; + field1698[var4] = modelViewportXs[var5]; + field1699[var4] = modelViewportYs[var5]; + field1700[var4++] = this.faceColors1[var1]; } else { - var11 = field1703[var5]; - var12 = field1699[var5]; + var11 = field1670[var5]; + var12 = field1691[var5]; var13 = this.faceColors1[var1]; if (var10 >= 50) { - var14 = field1726[var10 - var8] * (50 - var8); - field1714[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1703[var7] - var11) * var14 >> 16)) / 50; - field1715[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1699[var7] - var12) * var14 >> 16)) / 50; - field1707[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); + var14 = field1675[var10 - var8] * (50 - var8); + field1698[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1670[var7] - var11) * var14 >> 16)) / 50; + field1699[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1691[var7] - var12) * var14 >> 16)) / 50; + field1700[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); } if (var9 >= 50) { - var14 = field1726[var9 - var8] * (50 - var8); - field1714[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1703[var6] - var11) * var14 >> 16)) / 50; - field1715[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1699[var6] - var12) * var14 >> 16)) / 50; - field1707[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); + var14 = field1675[var9 - var8] * (50 - var8); + field1698[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1670[var6] - var11) * var14 >> 16)) / 50; + field1699[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1691[var6] - var12) * var14 >> 16)) / 50; + field1700[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); } } if (var9 >= 50) { - field1714[var4] = modelViewportXs[var6]; - field1715[var4] = modelViewportYs[var6]; - field1707[var4++] = this.faceColors2[var1]; + field1698[var4] = modelViewportXs[var6]; + field1699[var4] = modelViewportYs[var6]; + field1700[var4++] = this.faceColors2[var1]; } else { - var11 = field1703[var6]; - var12 = field1699[var6]; + var11 = field1670[var6]; + var12 = field1691[var6]; var13 = this.faceColors2[var1]; if (var8 >= 50) { - var14 = field1726[var8 - var9] * (50 - var9); - field1714[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1703[var5] - var11) * var14 >> 16)) / 50; - field1715[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1699[var5] - var12) * var14 >> 16)) / 50; - field1707[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); + var14 = field1675[var8 - var9] * (50 - var9); + field1698[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1670[var5] - var11) * var14 >> 16)) / 50; + field1699[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1691[var5] - var12) * var14 >> 16)) / 50; + field1700[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); } if (var10 >= 50) { - var14 = field1726[var10 - var9] * (50 - var9); - field1714[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1703[var7] - var11) * var14 >> 16)) / 50; - field1715[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1699[var7] - var12) * var14 >> 16)) / 50; - field1707[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); + var14 = field1675[var10 - var9] * (50 - var9); + field1698[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1670[var7] - var11) * var14 >> 16)) / 50; + field1699[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1691[var7] - var12) * var14 >> 16)) / 50; + field1700[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); } } if (var10 >= 50) { - field1714[var4] = modelViewportXs[var7]; - field1715[var4] = modelViewportYs[var7]; - field1707[var4++] = this.faceColors3[var1]; + field1698[var4] = modelViewportXs[var7]; + field1699[var4] = modelViewportYs[var7]; + field1700[var4++] = this.faceColors3[var1]; } else { - var11 = field1703[var7]; - var12 = field1699[var7]; + var11 = field1670[var7]; + var12 = field1691[var7]; var13 = this.faceColors3[var1]; if (var9 >= 50) { - var14 = field1726[var9 - var10] * (50 - var10); - field1714[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1703[var6] - var11) * var14 >> 16)) / 50; - field1715[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1699[var6] - var12) * var14 >> 16)) / 50; - field1707[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); + var14 = field1675[var9 - var10] * (50 - var10); + field1698[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1670[var6] - var11) * var14 >> 16)) / 50; + field1699[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1691[var6] - var12) * var14 >> 16)) / 50; + field1700[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); } if (var8 >= 50) { - var14 = field1726[var8 - var10] * (50 - var10); - field1714[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1703[var5] - var11) * var14 >> 16)) / 50; - field1715[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1699[var5] - var12) * var14 >> 16)) / 50; - field1707[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); + var14 = field1675[var8 - var10] * (50 - var10); + field1698[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1670[var5] - var11) * var14 >> 16)) / 50; + field1699[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1691[var5] - var12) * var14 >> 16)) / 50; + field1700[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); } } - var11 = field1714[0]; - var12 = field1714[1]; - var13 = field1714[2]; - var14 = field1715[0]; - int var15 = field1715[1]; - int var16 = field1715[2]; - Rasterizer3D.field1757 = false; + var11 = field1698[0]; + var12 = field1698[1]; + var13 = field1698[2]; + var14 = field1699[0]; + int var15 = field1699[1]; + int var16 = field1699[2]; + Rasterizer3D.field1751 = 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.field1757 = true; + Rasterizer3D.field1751 = true; } if (this.faceTextures != null && this.faceTextures[var1] != -1) { - if (this.field1676 != null && this.field1676[var1] != -1) { - var20 = this.field1676[var1] & 255; - var17 = this.field1680[var20]; - var18 = this.field1705[var20]; - var19 = this.field1682[var20]; + if (this.field1703 != null && this.field1703[var1] != -1) { + var20 = this.field1703[var1] & 255; + var17 = this.field1664[var20]; + var18 = this.field1665[var20]; + var19 = this.field1693[var20]; } else { var17 = var5; var18 = var6; @@ -1542,28 +1513,28 @@ public class Model extends Entity { } if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3034(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1703[var17], field1703[var18], field1703[var19], field1699[var17], field1699[var18], field1699[var19], field1673[var17], field1673[var18], field1673[var19], this.faceTextures[var1]); + Rasterizer3D.method3010(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1670[var17], field1670[var18], field1670[var19], field1691[var17], field1691[var18], field1691[var19], field1689[var17], field1689[var18], field1689[var19], this.faceTextures[var1]); } else { - Rasterizer3D.method3034(var14, var15, var16, var11, var12, var13, field1707[0], field1707[1], field1707[2], field1703[var17], field1703[var18], field1703[var19], field1699[var17], field1699[var18], field1699[var19], field1673[var17], field1673[var18], field1673[var19], this.faceTextures[var1]); + Rasterizer3D.method3010(var14, var15, var16, var11, var12, var13, field1700[0], field1700[1], field1700[2], field1670[var17], field1670[var18], field1670[var19], field1691[var17], field1691[var18], field1691[var19], field1689[var17], field1689[var18], field1689[var19], this.faceTextures[var1]); } } else if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3055(var14, var15, var16, var11, var12, var13, field1725[this.faceColors1[var1]]); + Rasterizer3D.method3008(var14, var15, var16, var11, var12, var13, field1709[this.faceColors1[var1]]); } else { - Rasterizer3D.method3030(var14, var15, var16, var11, var12, var13, field1707[0], field1707[1], field1707[2]); + Rasterizer3D.method3000(var14, var15, var16, var11, var12, var13, field1700[0], field1700[1], field1700[2]); } } if (var4 == 4) { - if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field1714[3] < 0 || field1714[3] > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field1757 = true; + if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field1698[3] < 0 || field1698[3] > Rasterizer3D.Rasterizer3D_clipWidth) { + Rasterizer3D.field1751 = true; } if (this.faceTextures != null && this.faceTextures[var1] != -1) { - if (this.field1676 != null && this.field1676[var1] != -1) { - var20 = this.field1676[var1] & 255; - var17 = this.field1680[var20]; - var18 = this.field1705[var20]; - var19 = this.field1682[var20]; + if (this.field1703 != null && this.field1703[var1] != -1) { + var20 = this.field1703[var1] & 255; + var17 = this.field1664[var20]; + var18 = this.field1665[var20]; + var19 = this.field1693[var20]; } else { var17 = var5; var18 = var6; @@ -1572,19 +1543,19 @@ public class Model extends Entity { short var21 = this.faceTextures[var1]; if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3034(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1703[var17], field1703[var18], field1703[var19], field1699[var17], field1699[var18], field1699[var19], field1673[var17], field1673[var18], field1673[var19], var21); - Rasterizer3D.method3034(var14, var16, field1715[3], var11, var13, field1714[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1703[var17], field1703[var18], field1703[var19], field1699[var17], field1699[var18], field1699[var19], field1673[var17], field1673[var18], field1673[var19], var21); + Rasterizer3D.method3010(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1670[var17], field1670[var18], field1670[var19], field1691[var17], field1691[var18], field1691[var19], field1689[var17], field1689[var18], field1689[var19], var21); + Rasterizer3D.method3010(var14, var16, field1699[3], var11, var13, field1698[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1670[var17], field1670[var18], field1670[var19], field1691[var17], field1691[var18], field1691[var19], field1689[var17], field1689[var18], field1689[var19], var21); } else { - Rasterizer3D.method3034(var14, var15, var16, var11, var12, var13, field1707[0], field1707[1], field1707[2], field1703[var17], field1703[var18], field1703[var19], field1699[var17], field1699[var18], field1699[var19], field1673[var17], field1673[var18], field1673[var19], var21); - Rasterizer3D.method3034(var14, var16, field1715[3], var11, var13, field1714[3], field1707[0], field1707[2], field1707[3], field1703[var17], field1703[var18], field1703[var19], field1699[var17], field1699[var18], field1699[var19], field1673[var17], field1673[var18], field1673[var19], var21); + Rasterizer3D.method3010(var14, var15, var16, var11, var12, var13, field1700[0], field1700[1], field1700[2], field1670[var17], field1670[var18], field1670[var19], field1691[var17], field1691[var18], field1691[var19], field1689[var17], field1689[var18], field1689[var19], var21); + Rasterizer3D.method3010(var14, var16, field1699[3], var11, var13, field1698[3], field1700[0], field1700[2], field1700[3], field1670[var17], field1670[var18], field1670[var19], field1691[var17], field1691[var18], field1691[var19], field1689[var17], field1689[var18], field1689[var19], var21); } } else if (this.faceColors3[var1] == -1) { - var17 = field1725[this.faceColors1[var1]]; - Rasterizer3D.method3055(var14, var15, var16, var11, var12, var13, var17); - Rasterizer3D.method3055(var14, var16, field1715[3], var11, var13, field1714[3], var17); + var17 = field1709[this.faceColors1[var1]]; + Rasterizer3D.method3008(var14, var15, var16, var11, var12, var13, var17); + Rasterizer3D.method3008(var14, var16, field1699[3], var11, var13, field1698[3], var17); } else { - Rasterizer3D.method3030(var14, var15, var16, var11, var12, var13, field1707[0], field1707[1], field1707[2]); - Rasterizer3D.method3030(var14, var16, field1715[3], var11, var13, field1714[3], field1707[0], field1707[2], field1707[3]); + Rasterizer3D.method3000(var14, var15, var16, var11, var12, var13, field1700[0], field1700[1], field1700[2]); + Rasterizer3D.method3000(var14, var16, field1699[3], var11, var13, field1698[3], field1700[0], field1700[2], field1700[3]); } } @@ -1593,7 +1564,7 @@ public class Model extends Entity { @ObfuscatedName("ch") @Export("draw") void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { - field1684[0] = -1; + field1651[0] = -1; if (this.boundsType != 1) { this.calculateBoundsCylinder(); } @@ -1623,104 +1594,104 @@ public class Model extends Entity { var25 = true; } - boolean var26 = var25 || this.field1679 > 0; - int var27 = ViewportMouse.ViewportMouse_x; - int var29 = class192.method3730(); - boolean var30 = ViewportMouse.ViewportMouse_isInViewport; - boolean var32 = WallDecoration.method3340(var9); - boolean var33 = false; + boolean var26 = var25 || this.field1688 > 0; + int var27 = class218.method4074(); + int var28 = TileItemPile.method2797(); + boolean var29 = ViewportMouse.ViewportMouse_isInViewport; + boolean var31 = class42.method790(var9); + boolean var32 = false; + int var34; int var35; int var36; - int var37; - if (var32 && var30) { - boolean var34 = false; - if (field1720) { - var34 = Interpreter.method1969(this, var6, var7, var8); + if (var31 && var29) { + boolean var33 = false; + if (field1704) { + var33 = MusicPatchNode.method3813(this, var6, var7, var8); } else { - var35 = var12 - var13; - if (var35 <= 50) { - var35 = 50; + var34 = var12 - var13; + if (var34 <= 50) { + var34 = 50; } if (var15 > 0) { var16 /= var14; - var17 /= var35; + var17 /= var34; } else { var17 /= var14; - var16 /= var35; + var16 /= var34; } if (var18 > 0) { var22 /= var14; - var20 /= var35; + var20 /= var34; } else { var20 /= var14; - var22 /= var35; + var22 /= var34; } - var36 = var27 - Rasterizer3D.Rasterizer3D_clipMidX; - var37 = var29 - Rasterizer3D.Rasterizer3D_clipMidY; - if (var36 > var16 && var36 < var17 && var37 > var22 && var37 < var20) { - var34 = true; - } - } - - if (var34) { - if (this.isSingleTile) { - ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var9; - } else { + var35 = var27 - Rasterizer3D.Rasterizer3D_clipMidX; + var36 = var28 - Rasterizer3D.Rasterizer3D_clipMidY; + if (var35 > var16 && var35 < var17 && var36 > var22 && var36 < var20) { var33 = true; } } + + if (var33) { + if (this.isSingleTile) { + ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var9; + } else { + var32 = true; + } + } } - int var47 = Rasterizer3D.Rasterizer3D_clipMidX; - var35 = Rasterizer3D.Rasterizer3D_clipMidY; + int var46 = Rasterizer3D.Rasterizer3D_clipMidX; + var34 = Rasterizer3D.Rasterizer3D_clipMidY; + var35 = 0; var36 = 0; - var37 = 0; if (var1 != 0) { - var36 = Model_sine[var1]; - var37 = Model_cosine[var1]; + var35 = Model_sine[var1]; + var36 = Model_cosine[var1]; } - for (int var38 = 0; var38 < this.verticesCount; ++var38) { - int var39 = this.verticesX[var38]; - int var40 = this.verticesY[var38]; - int var41 = this.verticesZ[var38]; - int var42; + for (int var37 = 0; var37 < this.verticesCount; ++var37) { + int var38 = this.verticesX[var37]; + int var39 = this.verticesY[var37]; + int var40 = this.verticesZ[var37]; + int var41; if (var1 != 0) { - var42 = var41 * var36 + var39 * var37 >> 16; - var41 = var41 * var37 - var39 * var36 >> 16; - var39 = var42; + var41 = var40 * var35 + var38 * var36 >> 16; + var40 = var40 * var36 - var38 * var35 >> 16; + var38 = var41; } - var39 += var6; - var40 += var7; - var41 += var8; - var42 = var41 * var4 + var5 * var39 >> 16; - var41 = var5 * var41 - var39 * var4 >> 16; - var39 = var42; - var42 = var3 * var40 - var41 * var2 >> 16; - var41 = var40 * var2 + var3 * var41 >> 16; - field1681[var38] = var41 - var12; - if (var41 >= 50) { - modelViewportXs[var38] = var39 * Rasterizer3D.Rasterizer3D_zoom / var41 + var47; - modelViewportYs[var38] = var42 * Rasterizer3D.Rasterizer3D_zoom / var41 + var35; + var38 += var6; + var39 += var7; + var40 += var8; + var41 = var40 * var4 + var5 * var38 >> 16; + var40 = var5 * var40 - var38 * var4 >> 16; + var38 = var41; + var41 = var3 * var39 - var40 * var2 >> 16; + var40 = var39 * var2 + var3 * var40 >> 16; + field1710[var37] = var40 - var12; + if (var40 >= 50) { + modelViewportXs[var37] = var38 * Rasterizer3D.Rasterizer3D_zoom / var40 + var46; + modelViewportYs[var37] = var41 * Rasterizer3D.Rasterizer3D_zoom / var40 + var34; } else { - modelViewportXs[var38] = -5000; + modelViewportXs[var37] = -5000; var24 = true; } if (var26) { - field1703[var38] = var39; - field1699[var38] = var42; - field1673[var38] = var41; + field1670[var37] = var38; + field1691[var37] = var41; + field1689[var37] = var40; } } try { - this.draw0(var24, var33, this.isSingleTile, var9); - } catch (Exception var46) { + this.draw0(var24, var32, this.isSingleTile, var9); + } catch (Exception var45) { } } diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java index 29677df475..1d4a309cd6 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("dq") +@ObfuscatedName("dd") @Implements("ModelData") public class ModelData extends Entity { - @ObfuscatedName("ab") - static int[] field1576; + @ObfuscatedName("an") + static int[] field1558; @ObfuscatedName("ar") - static int[] field1543; - @ObfuscatedName("av") - static int field1552; - @ObfuscatedName("aq") + static int[] field1559; + @ObfuscatedName("az") + static int field1554; + @ObfuscatedName("ay") @Export("ModelData_sine") static int[] ModelData_sine; - @ObfuscatedName("ac") + @ObfuscatedName("ag") @Export("ModelData_cosine") static int[] ModelData_cosine; - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("verticesCount") int verticesCount; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("verticesX") int[] verticesX; - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("verticesY") int[] verticesY; - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("faceCount") int faceCount; - @ObfuscatedName("p") + @ObfuscatedName("b") @Export("indices1") int[] indices1; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("indices2") int[] indices2; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("indices3") int[] indices3; - @ObfuscatedName("w") + @ObfuscatedName("a") @Export("faceRenderTypes") byte[] faceRenderTypes; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("k") + @ObfuscatedName("c") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("x") + @ObfuscatedName("o") @Export("textureCoords") byte[] textureCoords; - @ObfuscatedName("o") + @ObfuscatedName("v") @Export("faceColors") short[] faceColors; - @ObfuscatedName("e") + @ObfuscatedName("k") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("n") + @ObfuscatedName("s") @Export("priority") byte priority; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("textureTriangleCount") int textureTriangleCount; - @ObfuscatedName("c") + @ObfuscatedName("t") @Export("textureRenderTypes") byte[] textureRenderTypes; - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("texTriangleX") short[] texTriangleX; - @ObfuscatedName("d") + @ObfuscatedName("n") @Export("texTriangleY") short[] texTriangleY; - @ObfuscatedName("s") + @ObfuscatedName("u") @Export("texTriangleZ") short[] texTriangleZ; - @ObfuscatedName("t") + @ObfuscatedName("z") @Export("vertexSkins") int[] vertexSkins; - @ObfuscatedName("m") + @ObfuscatedName("h") @Export("faceSkins") int[] faceSkins; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("q") + @ObfuscatedName("g") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("l") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "[Lea;" + signature = "[Les;" ) @Export("faceNormals") FaceNormal[] faceNormals; - @ObfuscatedName("j") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "[Ldy;" + signature = "[Ldm;" ) @Export("vertexNormals") VertexNormal[] vertexNormals; - @ObfuscatedName("af") + @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "[Ldy;" + signature = "[Ldm;" ) - VertexNormal[] field1565; - @ObfuscatedName("ad") + VertexNormal[] field1549; + @ObfuscatedName("av") @Export("ambient") public short ambient; - @ObfuscatedName("am") + @ObfuscatedName("aw") @Export("contrast") public short contrast; - @ObfuscatedName("ai") + @ObfuscatedName("as") @Export("isBoundsCalculated") boolean isBoundsCalculated; - @ObfuscatedName("ag") - int field1569; - @ObfuscatedName("ao") - int field1570; - @ObfuscatedName("aw") - int field1559; @ObfuscatedName("ak") - int field1554; - @ObfuscatedName("aa") - int field1573; + int field1550; + @ObfuscatedName("au") + int field1527; + @ObfuscatedName("ah") + int field1555; + @ObfuscatedName("aq") + int field1541; + @ObfuscatedName("ao") + int field1529; static { - field1576 = new int[10000]; - field1543 = new int[10000]; - field1552 = 0; + field1558 = new int[10000]; + field1559 = new int[10000]; + field1554 = 0; ModelData_sine = Rasterizer3D.Rasterizer3D_sine; ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine; } @@ -143,7 +143,7 @@ public class ModelData extends Entity { } @ObfuscatedSignature( - signature = "([Ldq;I)V" + signature = "([Ldd;I)V" ) public ModelData(ModelData[] var1, int var2) { this.verticesCount = 0; @@ -274,18 +274,18 @@ public class ModelData extends Entity { } this.faceColors[this.faceCount] = var10.faceColors[var11]; - this.indices1[this.faceCount] = this.method2817(var10, var10.indices1[var11]); - this.indices2[this.faceCount] = this.method2817(var10, var10.indices2[var11]); - this.indices3[this.faceCount] = this.method2817(var10, var10.indices3[var11]); + this.indices1[this.faceCount] = this.method2802(var10, var10.indices1[var11]); + this.indices2[this.faceCount] = this.method2802(var10, var10.indices2[var11]); + this.indices3[this.faceCount] = this.method2802(var10, var10.indices3[var11]); ++this.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.method2817(var10, var10.texTriangleX[var11]); - this.texTriangleY[this.textureTriangleCount] = (short)this.method2817(var10, var10.texTriangleY[var11]); - this.texTriangleZ[this.textureTriangleCount] = (short)this.method2817(var10, var10.texTriangleZ[var11]); + this.texTriangleX[this.textureTriangleCount] = (short)this.method2802(var10, var10.texTriangleX[var11]); + this.texTriangleY[this.textureTriangleCount] = (short)this.method2802(var10, var10.texTriangleY[var11]); + this.texTriangleZ[this.textureTriangleCount] = (short)this.method2802(var10, var10.texTriangleZ[var11]); } ++this.textureTriangleCount; @@ -301,15 +301,15 @@ public class ModelData extends Entity { this.priority = 0; this.isBoundsCalculated = false; if (var1[var1.length - 1] == -1 && var1[var1.length - 2] == -1) { - this.method2814(var1); + this.method2822(var1); } else { - this.method2815(var1); + this.method2801(var1); } } @ObfuscatedSignature( - signature = "(Ldq;ZZZZ)V", + signature = "(Ldd;ZZZZ)V", garbageValue = "1" ) public ModelData(ModelData var1, boolean var2, boolean var3, boolean var4, boolean var5) { @@ -375,13 +375,13 @@ public class ModelData extends Entity { this.faceLabelsAlpha = var1.faceLabelsAlpha; this.vertexNormals = var1.vertexNormals; this.faceNormals = var1.faceNormals; - this.field1565 = var1.field1565; + this.field1549 = var1.field1549; this.ambient = var1.ambient; this.contrast = var1.contrast; } - @ObfuscatedName("f") - void method2814(byte[] var1) { + @ObfuscatedName("i") + void method2822(byte[] var1) { Buffer var2 = new Buffer(var1); Buffer var3 = new Buffer(var1); Buffer var4 = new Buffer(var1); @@ -686,8 +686,8 @@ public class ModelData extends Entity { } - @ObfuscatedName("b") - void method2815(byte[] var1) { + @ObfuscatedName("y") + void method2801(byte[] var1) { boolean var2 = false; boolean var3 = false; Buffer var4 = new Buffer(var1); @@ -963,11 +963,11 @@ public class ModelData extends Entity { } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Ldq;I)I" + signature = "(Ldd;I)I" ) - final int method2817(ModelData var1, int var2) { + final int method2802(ModelData var1, int var2) { int var3 = -1; int var4 = var1.verticesX[var2]; int var5 = var1.verticesY[var2]; @@ -994,11 +994,11 @@ public class ModelData extends Entity { return var3; } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "()Ldq;" + signature = "()Ldd;" ) - public ModelData method2839() { + public ModelData method2803() { ModelData var1 = new ModelData(); if (this.faceRenderTypes != null) { var1.faceRenderTypes = new byte[this.faceCount]; @@ -1038,16 +1038,16 @@ public class ModelData extends Entity { return var1; } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "([[IIIIZI)Ldq;" + signature = "([[IIIIZI)Ldd;" ) - public ModelData method2819(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { + public ModelData method2804(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { this.calculateBounds(); - int var7 = var2 + this.field1570; - int var8 = var2 + this.field1559; - int var9 = var4 + this.field1573; - int var10 = var4 + this.field1554; + int var7 = var2 + this.field1527; + int var8 = var2 + this.field1555; + int var9 = var4 + this.field1529; + int var10 = var4 + this.field1541; if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { var7 >>= 7; var8 = var8 + 127 >> 7; @@ -1132,8 +1132,8 @@ public class ModelData extends Entity { } } - @ObfuscatedName("h") - void method2820() { + @ObfuscatedName("e") + void method2805() { int[] var1; int var2; int var10002; @@ -1193,8 +1193,8 @@ public class ModelData extends Entity { } - @ObfuscatedName("y") - public void method2884() { + @ObfuscatedName("x") + public void method2872() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { int var2 = this.verticesX[var1]; this.verticesX[var1] = this.verticesZ[var1]; @@ -1204,8 +1204,8 @@ public class ModelData extends Entity { this.invalidate(); } - @ObfuscatedName("i") - public void method2872() { + @ObfuscatedName("d") + public void method2807() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { this.verticesX[var1] = -this.verticesX[var1]; this.verticesZ[var1] = -this.verticesZ[var1]; @@ -1214,8 +1214,8 @@ public class ModelData extends Entity { this.invalidate(); } - @ObfuscatedName("k") - public void method2823() { + @ObfuscatedName("c") + public void method2798() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { int var2 = this.verticesZ[var1]; this.verticesZ[var1] = this.verticesX[var1]; @@ -1225,8 +1225,8 @@ public class ModelData extends Entity { this.invalidate(); } - @ObfuscatedName("x") - public void method2822(int var1) { + @ObfuscatedName("o") + public void method2809(int var1) { int var2 = ModelData_sine[var1]; int var3 = ModelData_cosine[var1]; @@ -1239,7 +1239,7 @@ public class ModelData extends Entity { this.invalidate(); } - @ObfuscatedName("o") + @ObfuscatedName("l") @Export("changeOffset") public void changeOffset(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { @@ -1254,7 +1254,7 @@ public class ModelData extends Entity { this.invalidate(); } - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("recolor") public void recolor(short var1, short var2) { for (int var3 = 0; var3 < this.faceCount; ++var3) { @@ -1265,7 +1265,7 @@ public class ModelData extends Entity { } - @ObfuscatedName("n") + @ObfuscatedName("j") @Export("retexture") public void retexture(short var1, short var2) { if (this.faceTextures != null) { @@ -1278,8 +1278,8 @@ public class ModelData extends Entity { } } - @ObfuscatedName("c") - public void method2878() { + @ObfuscatedName("n") + public void method2817() { int var1; for (var1 = 0; var1 < this.verticesCount; ++var1) { this.verticesZ[var1] = -this.verticesZ[var1]; @@ -1294,7 +1294,7 @@ public class ModelData extends Entity { this.invalidate(); } - @ObfuscatedName("s") + @ObfuscatedName("u") @Export("resize") public void resize(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { @@ -1306,7 +1306,7 @@ public class ModelData extends Entity { this.invalidate(); } - @ObfuscatedName("t") + @ObfuscatedName("z") @Export("calculateVertexNormals") public void calculateVertexNormals() { if (this.vertexNormals == null) { @@ -1382,52 +1382,52 @@ public class ModelData extends Entity { } } - @ObfuscatedName("m") + @ObfuscatedName("h") @Export("invalidate") void invalidate() { this.vertexNormals = null; - this.field1565 = null; + this.field1549 = null; this.faceNormals = null; this.isBoundsCalculated = false; } - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("calculateBounds") void calculateBounds() { if (!this.isBoundsCalculated) { super.height = 0; - this.field1569 = 0; - this.field1570 = 999999; - this.field1559 = -999999; - this.field1554 = -99999; - this.field1573 = 99999; + this.field1550 = 0; + this.field1527 = 999999; + this.field1555 = -999999; + this.field1541 = -99999; + this.field1529 = 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.field1570) { - this.field1570 = var2; + if (var2 < this.field1527) { + this.field1527 = var2; } - if (var2 > this.field1559) { - this.field1559 = var2; + if (var2 > this.field1555) { + this.field1555 = var2; } - if (var4 < this.field1573) { - this.field1573 = var4; + if (var4 < this.field1529) { + this.field1529 = var4; } - if (var4 > this.field1554) { - this.field1554 = var4; + if (var4 > this.field1541) { + this.field1541 = var4; } if (-var3 > super.height) { super.height = -var3; } - if (var3 > this.field1569) { - this.field1569 = var3; + if (var3 > this.field1550) { + this.field1550 = var3; } } @@ -1435,9 +1435,9 @@ public class ModelData extends Entity { } } - @ObfuscatedName("l") + @ObfuscatedName("av") @ObfuscatedSignature( - signature = "(IIIII)Ldf;" + signature = "(IIIII)Ldw;" ) @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.field1679 = 0; + var8.field1688 = 0; for (var10 = 0; var10 < this.textureTriangleCount; ++var10) { if (var9[var10] > 0 && this.textureRenderTypes[var10] == 0) { - ++var8.field1679; + ++var8.field1688; } } - var8.field1680 = new int[var8.field1679]; - var8.field1705 = new int[var8.field1679]; - var8.field1682 = new int[var8.field1679]; + var8.field1664 = new int[var8.field1688]; + var8.field1665 = new int[var8.field1688]; + var8.field1693 = new int[var8.field1688]; var10 = 0; int var11; for (var11 = 0; var11 < this.textureTriangleCount; ++var11) { if (var9[var11] > 0 && this.textureRenderTypes[var11] == 0) { - var8.field1680[var10] = this.texTriangleX[var11] & '\uffff'; - var8.field1705[var10] = this.texTriangleY[var11] & '\uffff'; - var8.field1682[var10] = this.texTriangleZ[var11] & '\uffff'; + var8.field1664[var10] = this.texTriangleX[var11] & '\uffff'; + var8.field1665[var10] = this.texTriangleY[var11] & '\uffff'; + var8.field1693[var10] = this.texTriangleZ[var11] & '\uffff'; var9[var11] = var10++; } else { var9[var11] = -1; } } - var8.field1676 = new byte[this.faceCount]; + var8.field1703 = new byte[this.faceCount]; for (var11 = 0; var11 < this.faceCount; ++var11) { if (this.textureCoords[var11] != -1) { - var8.field1676[var11] = (byte)var9[this.textureCoords[var11] & 255]; + var8.field1703[var11] = (byte)var9[this.textureCoords[var11] & 255]; } else { - var8.field1676[var11] = -1; + var8.field1703[var11] = -1; } } } @@ -1532,7 +1532,7 @@ public class ModelData extends Entity { if (var17 == 1) { var19 = this.faceNormals[var16]; var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; - var8.faceColors1[var16] = method2834(this.faceColors[var16] & '\uffff', var14); + var8.faceColors1[var16] = method2864(this.faceColors[var16] & '\uffff', var14); var8.faceColors3[var16] = -1; } else if (var17 == 3) { var8.faceColors1[var16] = 128; @@ -1542,69 +1542,69 @@ public class ModelData extends Entity { } } else { int var15 = this.faceColors[var16] & '\uffff'; - if (this.field1565 != null && this.field1565[this.indices1[var16]] != null) { - var13 = this.field1565[this.indices1[var16]]; + if (this.field1549 != null && this.field1549[this.indices1[var16]] != null) { + var13 = this.field1549[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] = method2834(var15, var14); - if (this.field1565 != null && this.field1565[this.indices2[var16]] != null) { - var13 = this.field1565[this.indices2[var16]]; + var8.faceColors1[var16] = method2864(var15, var14); + if (this.field1549 != null && this.field1549[this.indices2[var16]] != null) { + var13 = this.field1549[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] = method2834(var15, var14); - if (this.field1565 != null && this.field1565[this.indices3[var16]] != null) { - var13 = this.field1565[this.indices3[var16]]; + var8.faceColors2[var16] = method2864(var15, var14); + if (this.field1549 != null && this.field1549[this.indices3[var16]] != null) { + var13 = this.field1549[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] = method2834(var15, var14); + var8.faceColors3[var16] = method2864(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] = method2835(var14); + var8.faceColors1[var16] = method2830(var14); var8.faceColors3[var16] = -1; } else { var8.faceColors3[var16] = -2; } } else { - if (this.field1565 != null && this.field1565[this.indices1[var16]] != null) { - var13 = this.field1565[this.indices1[var16]]; + if (this.field1549 != null && this.field1549[this.indices1[var16]] != null) { + var13 = this.field1549[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] = method2835(var14); - if (this.field1565 != null && this.field1565[this.indices2[var16]] != null) { - var13 = this.field1565[this.indices2[var16]]; + var8.faceColors1[var16] = method2830(var14); + if (this.field1549 != null && this.field1549[this.indices2[var16]] != null) { + var13 = this.field1549[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] = method2835(var14); - if (this.field1565 != null && this.field1565[this.indices3[var16]] != null) { - var13 = this.field1565[this.indices3[var16]]; + var8.faceColors2[var16] = method2830(var14); + if (this.field1549 != null && this.field1549[this.indices3[var16]] != null) { + var13 = this.field1549[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] = method2835(var14); + var8.faceColors3[var16] = method2830(var14); } } - this.method2820(); + this.method2805(); var8.verticesCount = this.verticesCount; var8.verticesX = this.verticesX; var8.verticesY = this.verticesY; @@ -1615,16 +1615,16 @@ public class ModelData extends Entity { var8.indices3 = this.indices3; var8.faceRenderPriorities = this.faceRenderPriorities; var8.faceAlphas = this.faceAlphas; - var8.field1678 = this.priority; + var8.field1662 = this.priority; var8.vertexLabels = this.vertexLabels; var8.faceLabelsAlpha = this.faceLabelsAlpha; var8.faceTextures = this.faceTextures; return var8; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Lhf;II)Ldq;" + signature = "(Lhz;II)Ldd;" ) @Export("ModelData_get") public static ModelData ModelData_get(AbstractArchive var0, int var1, int var2) { @@ -1632,16 +1632,16 @@ public class ModelData extends Entity { return var3 == null ? null : new ModelData(var3); } - @ObfuscatedName("q") + @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "(Ldq;Ldq;IIIZ)V" + signature = "(Ldd;Ldd;IIIZ)V" ) - static void method2828(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { + static void method2818(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { var0.calculateBounds(); var0.calculateVertexNormals(); var1.calculateBounds(); var1.calculateVertexNormals(); - ++field1552; + ++field1554; int var6 = 0; int[] var7 = var1.verticesX; int var8 = var1.verticesCount; @@ -1651,30 +1651,30 @@ public class ModelData extends Entity { VertexNormal var10 = var0.vertexNormals[var9]; if (var10.magnitude != 0) { int var11 = var0.verticesY[var9] - var3; - if (var11 <= var1.field1569) { + if (var11 <= var1.field1550) { int var12 = var0.verticesX[var9] - var2; - if (var12 >= var1.field1570 && var12 <= var1.field1559) { + if (var12 >= var1.field1527 && var12 <= var1.field1555) { int var13 = var0.verticesZ[var9] - var4; - if (var13 >= var1.field1573 && var13 <= var1.field1554) { + if (var13 >= var1.field1529 && var13 <= var1.field1541) { 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.field1565 == null) { - var0.field1565 = new VertexNormal[var0.verticesCount]; + if (var0.field1549 == null) { + var0.field1549 = new VertexNormal[var0.verticesCount]; } - if (var1.field1565 == null) { - var1.field1565 = new VertexNormal[var8]; + if (var1.field1549 == null) { + var1.field1549 = new VertexNormal[var8]; } - VertexNormal var16 = var0.field1565[var9]; + VertexNormal var16 = var0.field1549[var9]; if (var16 == null) { - var16 = var0.field1565[var9] = new VertexNormal(var10); + var16 = var0.field1549[var9] = new VertexNormal(var10); } - VertexNormal var17 = var1.field1565[var14]; + VertexNormal var17 = var1.field1549[var14]; if (var17 == null) { - var17 = var1.field1565[var14] = new VertexNormal(var15); + var17 = var1.field1549[var14] = new VertexNormal(var15); } var16.x += var15.x; @@ -1686,8 +1686,8 @@ public class ModelData extends Entity { var17.z += var10.z; var17.magnitude += var10.magnitude; ++var6; - field1576[var9] = field1552; - field1543[var14] = field1552; + field1558[var9] = field1554; + field1559[var14] = field1554; } } } @@ -1698,7 +1698,7 @@ public class ModelData extends Entity { if (var6 >= 3 && var5) { for (var9 = 0; var9 < var0.faceCount; ++var9) { - if (field1576[var0.indices1[var9]] == field1552 && field1576[var0.indices2[var9]] == field1552 && field1576[var0.indices3[var9]] == field1552) { + if (field1558[var0.indices1[var9]] == field1554 && field1558[var0.indices2[var9]] == field1554 && field1558[var0.indices3[var9]] == field1554) { if (var0.faceRenderTypes == null) { var0.faceRenderTypes = new byte[var0.faceCount]; } @@ -1708,7 +1708,7 @@ public class ModelData extends Entity { } for (var9 = 0; var9 < var1.faceCount; ++var9) { - if (field1552 == field1543[var1.indices1[var9]] && field1552 == field1543[var1.indices2[var9]] && field1552 == field1543[var1.indices3[var9]]) { + if (field1554 == field1559[var1.indices1[var9]] && field1554 == field1559[var1.indices2[var9]] && field1554 == field1559[var1.indices3[var9]]) { if (var1.faceRenderTypes == null) { var1.faceRenderTypes = new byte[var1.faceCount]; } @@ -1720,8 +1720,8 @@ public class ModelData extends Entity { } } - @ObfuscatedName("j") - static final int method2834(int var0, int var1) { + @ObfuscatedName("aw") + static final int method2864(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; if (var1 < 2) { var1 = 2; @@ -1732,8 +1732,8 @@ public class ModelData extends Entity { return (var0 & 65408) + var1; } - @ObfuscatedName("ad") - static final int method2835(int var0) { + @ObfuscatedName("as") + static final int method2830(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 ddd6167143..49769680b2 100644 --- a/runescape-client/src/main/java/ModelData0.java +++ b/runescape-client/src/main/java/ModelData0.java @@ -2,275 +2,145 @@ 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("em") +@ObfuscatedName("ew") @Implements("ModelData0") public class ModelData0 { - ModelData0() { - } - - @ObfuscatedName("u") + @ObfuscatedName("df") @ObfuscatedSignature( - signature = "(Lkg;Llb;B)Llb;", - garbageValue = "38" + signature = "Lky;" ) - @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); - } + @Export("js5Socket") + static AbstractSocket js5Socket; - for (var3 = 0; var3 < var2; ++var3) { - boolean var7 = var0.readUnsignedByte() == 1; - int var5 = var0.readMedium(); - Object var6; - if (var7) { - var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); - } else { - var6 = new IntegerNode(var0.readInt()); - } - - var1.put((Node)var6, (long)var5); - } - - return var1; + ModelData0() { } @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Lgj;Lld;I)Lgx;", - garbageValue = "280522015" + signature = "(IIB)I", + garbageValue = "-54" ) - @Export("getPacketBufferNode") - public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { - PacketBufferNode var2 = StudioGame.method4225(); - 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); + public static int method3266(int var0, int var1) { + int var2; + for (var2 = 1; var1 > 1; var1 >>= 1) { + if ((var1 & 1) != 0) { + var2 = var0 * var2; + } + + var0 *= var0; } - var2.packetBuffer.setIsaacCipher(var1); - var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); - var2.index = 0; - return var2; + if (var1 == 1) { + return var0 * var2; + } else { + return var2; + } } - @ObfuscatedName("at") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(ILci;ZI)I", - garbageValue = "1140897416" + signature = "(I)[Llg;", + garbageValue = "-19364585" ) - static int method3299(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Canvas.loadWorlds() ? 1 : 0; - return 1; + @Export("FillMode_values") + public static FillMode[] FillMode_values() { + return new FillMode[]{FillMode.field3850, FillMode.SOLID, FillMode.field3853}; + } + + @ObfuscatedName("fr") + @ObfuscatedSignature( + signature = "(IB)V", + garbageValue = "-21" + ) + @Export("getLoginError") + static void getLoginError(int var0) { + if (var0 == -3) { + AbstractWorldMapData.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); + } else if (var0 == -2) { + AbstractWorldMapData.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); + } else if (var0 == -1) { + AbstractWorldMapData.setLoginResponseString("No response from server.", "Please try using a different world.", ""); + } else if (var0 == 3) { + Login.loginIndex = 3; + Login.field1181 = 1; + } else if (var0 == 4) { + Login.loginIndex = 12; + Login.field1167 = 0; + } else if (var0 == 5) { + Login.field1181 = 2; + AbstractWorldMapData.setLoginResponseString("Your account has not logged out from its last", "session or the server is too busy right now.", "Please try again in a few minutes."); + } else if (var0 == 68 || !Client.onMobile && var0 == 6) { + AbstractWorldMapData.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); + } else if (var0 == 7) { + AbstractWorldMapData.setLoginResponseString("This world is full.", "Please use a different world.", ""); + } else if (var0 == 8) { + AbstractWorldMapData.setLoginResponseString("Unable to connect.", "Login server offline.", ""); + } else if (var0 == 9) { + AbstractWorldMapData.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); + } else if (var0 == 10) { + AbstractWorldMapData.setLoginResponseString("Unable to connect.", "Bad session id.", ""); + } else if (var0 == 11) { + AbstractWorldMapData.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); + } else if (var0 == 12) { + AbstractWorldMapData.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); + } else if (var0 == 13) { + AbstractWorldMapData.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); + } else if (var0 == 14) { + AbstractWorldMapData.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 16) { + AbstractWorldMapData.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", ""); + } else if (var0 == 17) { + AbstractWorldMapData.setLoginResponseString("You are standing in a members-only area.", "To play on this world move to a free area first", ""); + } else if (var0 == 18) { + Login.loginIndex = 12; + Login.field1167 = 1; + } else if (var0 == 19) { + AbstractWorldMapData.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); + } else if (var0 == 20) { + AbstractWorldMapData.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); + } else if (var0 == 22) { + AbstractWorldMapData.setLoginResponseString("Malformed login packet.", "Please try again.", ""); + } else if (var0 == 23) { + AbstractWorldMapData.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 24) { + AbstractWorldMapData.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); + } else if (var0 == 25) { + AbstractWorldMapData.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); + } else if (var0 == 26) { + AbstractWorldMapData.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); + } else if (var0 == 27) { + AbstractWorldMapData.setLoginResponseString("", "Service unavailable.", ""); + } else if (var0 == 31) { + AbstractWorldMapData.setLoginResponseString("Your account must have a displayname set", "in order to play the game. Please set it", "via the website, or the main game."); + } else if (var0 == 32) { + AbstractWorldMapData.setLoginResponseString("Your attempt to log into your account was", "unsuccessful. Don't worry, you can sort", "this out by visiting the billing system."); + } else if (var0 == 37) { + AbstractWorldMapData.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); + } else if (var0 == 38) { + AbstractWorldMapData.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!"); + } else if (var0 == 55) { + Login.loginIndex = 8; } else { - World var3; - if (var0 == ScriptOpcodes.WORLDLIST_START) { - var3 = class215.worldListStart(); - if (var3 != null) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.id; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.properties; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var3.activity; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.location; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.population; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var3.host; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; - } + if (var0 == 56) { + AbstractWorldMapData.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); + class195.updateGameState(11); + return; + } - return 1; - } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { - var3 = class1.getNextWorldListWorld(); - if (var3 != null) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.id; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.properties; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var3.activity; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.location; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.population; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var3.host; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; - } + if (var0 == 57) { + AbstractWorldMapData.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); + class195.updateGameState(11); + return; + } - return 1; + if (var0 == 61) { + Login.loginIndex = 7; } else { - World var4; - int var5; - int var7; - if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { - var7 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var4 = null; - - for (var5 = 0; var5 < World.World_count; ++var5) { - if (var7 == Skills.World_worlds[var5].id) { - var4 = Skills.World_worlds[var5]; - break; - } - } - - if (var4 != null) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var4.id; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var4.properties; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var4.activity; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var4.location; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var4.population; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var4.host; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 4; - var7 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - boolean var10 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1] == 1; - var5 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 2]; - boolean var6 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 3] == 1; - class42.sortWorldList(var7, var10, var5, var6); - return 1; - } else if (var0 != ScriptOpcodes.GETWORLDINFO) { - if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { - Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - return 1; - } else { - int var8; - ParamDefinition var9; - if (var0 == ScriptOpcodes.NC_PARAM) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - var9 = MusicPatchNode.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = VarcInt.getNpcDefinition(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = VarcInt.getNpcDefinition(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } else if (var0 == ScriptOpcodes.LC_PARAM) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - var9 = MusicPatchNode.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = Occluder.getObjectDefinition(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Occluder.getObjectDefinition(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_PARAM) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - var9 = MusicPatchNode.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = Interpreter.ItemDefinition_get(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Interpreter.ItemDefinition_get(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - var9 = MusicPatchNode.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = class96.StructDefinition_getStructDefinition(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = class96.StructDefinition_getStructDefinition(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } else if (var0 == ScriptOpcodes.ON_MOBILE) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLIENTTYPE) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.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) { - --class43.Interpreter_stringStackSize; - --GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize; - return 1; - } else if (var0 == 6523) { - --class43.Interpreter_stringStackSize; - --GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize; - return 1; - } else if (var0 == ScriptOpcodes.BATTERYLEVEL) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1; - return 1; - } else if (var0 == ScriptOpcodes.BATTERYCHARGING) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 1; - return 1; - } else if (var0 == ScriptOpcodes.WIFIAVAILABLE) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 1; - return 1; - } else { - return 2; - } - } - } else { - var7 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - if (var7 >= 0 && var7 < World.World_count) { - var4 = Skills.World_worlds[var7]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var4.id; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var4.properties; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var4.activity; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var4.location; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var4.population; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var4.host; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } + AbstractWorldMapData.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); } } + + class195.updateGameState(10); } } diff --git a/runescape-client/src/main/java/MouseHandler.java b/runescape-client/src/main/java/MouseHandler.java index 43f00cd53d..6e0e16217d 100644 --- a/runescape-client/src/main/java/MouseHandler.java +++ b/runescape-client/src/main/java/MouseHandler.java @@ -3,125 +3,120 @@ import java.awt.event.FocusListener; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; -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; -@ObfuscatedName("bx") +@ObfuscatedName("bg") @Implements("MouseHandler") public class MouseHandler implements MouseListener, MouseMotionListener, FocusListener { - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "Lbx;" - ) - @Export("MouseHandler_instance") - public static MouseHandler MouseHandler_instance; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = 1490415365 - ) - @Export("MouseHandler_idleCycles") - public static volatile int MouseHandler_idleCycles; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = 1217324239 - ) - @Export("MouseHandler_currentButtonVolatile") - public static volatile int MouseHandler_currentButtonVolatile; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -311378261 - ) - @Export("MouseHandler_xVolatile") - public static volatile int MouseHandler_xVolatile; @ObfuscatedName("y") @ObfuscatedGetter( - longValue = 5498807514871953223L + longValue = 6391782561924892503L ) @Export("MouseHandler_millis") public static long MouseHandler_millis; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -269629863 + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "Lbg;" ) - @Export("MouseHandler_yVolatile") - public static volatile int MouseHandler_yVolatile; - @ObfuscatedName("i") + @Export("MouseHandler_instance") + public static MouseHandler MouseHandler_instance; + @ObfuscatedName("b") @ObfuscatedGetter( - longValue = -3394492836733746113L + intValue = 1020768775 ) - @Export("MouseHandler_lastMovedVolatile") - public static volatile long MouseHandler_lastMovedVolatile; - @ObfuscatedName("k") + @Export("MouseHandler_idleCycles") + public static volatile int MouseHandler_idleCycles; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1058751747 + intValue = 389551181 ) - @Export("MouseHandler_x") - public static int MouseHandler_x; + @Export("MouseHandler_currentButtonVolatile") + public static volatile int MouseHandler_currentButtonVolatile; @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1891385579 + intValue = 1844911271 ) @Export("MouseHandler_y") public static int MouseHandler_y; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 1784326917 + ) + @Export("MouseHandler_xVolatile") + public static volatile int MouseHandler_xVolatile; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 421105959 + ) + @Export("MouseHandler_yVolatile") + public static volatile int MouseHandler_yVolatile; + @ObfuscatedName("c") + @ObfuscatedGetter( + longValue = 5982585687992088541L + ) + @Export("MouseHandler_lastMovedVolatile") + public static volatile long MouseHandler_lastMovedVolatile; @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 2023684605 + intValue = -2063190937 ) @Export("MouseHandler_currentButton") public static int MouseHandler_currentButton; - @ObfuscatedName("e") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1519290605 + intValue = 651144281 + ) + @Export("MouseHandler_x") + public static int MouseHandler_x; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 417223015 ) @Export("MouseHandler_lastButtonVolatile") public static volatile int MouseHandler_lastButtonVolatile; - @ObfuscatedName("n") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 2092487579 + intValue = -1302280877 ) @Export("MouseHandler_lastPressedXVolatile") public static volatile int MouseHandler_lastPressedXVolatile; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 543803129 + intValue = 563945569 ) @Export("MouseHandler_lastPressedYVolatile") public static volatile int MouseHandler_lastPressedYVolatile; - @ObfuscatedName("c") + @ObfuscatedName("t") @ObfuscatedGetter( - longValue = -709521929383780473L + longValue = -2443087496811736215L ) @Export("MouseHandler_lastPressedTimeMillisVolatile") public static volatile long MouseHandler_lastPressedTimeMillisVolatile; - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 2081048445 + intValue = 1154411121 ) @Export("MouseHandler_lastButton") public static int MouseHandler_lastButton; - @ObfuscatedName("d") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1936188057 + intValue = -235347877 ) @Export("MouseHandler_lastPressedX") public static int MouseHandler_lastPressedX; - @ObfuscatedName("s") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1648942289 + intValue = -983973497 ) @Export("MouseHandler_lastPressedY") public static int MouseHandler_lastPressedY; - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedGetter( - longValue = -6127281793723747947L + longValue = 231265162038800951L ) @Export("MouseHandler_lastPressedTimeMillis") public static long MouseHandler_lastPressedTimeMillis; @@ -150,10 +145,10 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi MouseHandler() { } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "(Ljava/awt/event/MouseEvent;I)I", - garbageValue = "-1600778879" + garbageValue = "-1130050743" ) @Export("getButton") final int getButton(MouseEvent var1) { @@ -180,7 +175,7 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi MouseHandler_idleCycles = 0; MouseHandler_lastPressedXVolatile = var1.getX(); MouseHandler_lastPressedYVolatile = var1.getY(); - MouseHandler_lastPressedTimeMillisVolatile = TaskHandler.currentTimeMillis(); + MouseHandler_lastPressedTimeMillisVolatile = WorldMapID.currentTimeMillis(); MouseHandler_lastButtonVolatile = this.getButton(var1); if (MouseHandler_lastButtonVolatile != 0) { MouseHandler_currentButtonVolatile = MouseHandler_lastButtonVolatile; @@ -193,12 +188,7 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi } - public final synchronized void mouseReleased(MouseEvent var1) { - if (MouseHandler_instance != null) { - MouseHandler_idleCycles = 0; - MouseHandler_currentButtonVolatile = 0; - } - + public final void mouseClicked(MouseEvent var1) { if (var1.isPopupTrigger()) { var1.consume(); } @@ -223,9 +213,6 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi this.mouseMoved(var1); } - public final void focusGained(FocusEvent var1) { - } - public final synchronized void focusLost(FocusEvent var1) { if (MouseHandler_instance != null) { MouseHandler_currentButtonVolatile = 0; @@ -233,146 +220,133 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi } - public final void mouseClicked(MouseEvent var1) { + public final void focusGained(FocusEvent var1) { + } + + public final synchronized void mouseReleased(MouseEvent var1) { + if (MouseHandler_instance != null) { + MouseHandler_idleCycles = 0; + MouseHandler_currentButtonVolatile = 0; + } + if (var1.isPopupTrigger()) { var1.consume(); } } - @ObfuscatedName("u") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "([BI)Lln;", - garbageValue = "1946440209" + signature = "(II)I", + garbageValue = "-996326189" ) - @Export("convertJpgToSprite") - public static final Sprite convertJpgToSprite(byte[] var0) { - BufferedImage var1 = null; - - try { - var1 = ImageIO.read(new ByteArrayInputStream(var0)); - int var2 = var1.getWidth(); - int var3 = var1.getHeight(); - int[] var4 = new int[var3 * var2]; - PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2); - var5.grabPixels(); - return new Sprite(var4, var2, var3); - } catch (IOException var7) { - } catch (InterruptedException var8) { - } - - return new Sprite(0, 0); + @Export("Messages_getHistorySize") + static int Messages_getHistorySize(int var0) { + ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); + return var1 == null ? 0 : var1.size(); } - @ObfuscatedName("y") + @ObfuscatedName("hy") @ObfuscatedSignature( - signature = "(IIIZII)J", - garbageValue = "-1903712375" + signature = "(Lbn;I)Z", + garbageValue = "1190752161" ) - @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("fh") - @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "927465818" - ) - @Export("playSoundJingle") - static void playSoundJingle(int var0, int var1) { - if (Client.musicVolume != 0 && var0 != -1) { - class65.playMusicTrack(ScriptFrame.archive11, var0, 0, Client.musicVolume, false); - Client.field742 = true; - } - - } - - @ObfuscatedName("gn") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-1069270710" - ) - @Export("setWindowedMode") - static void setWindowedMode(int var0) { - Client.field652 = 0L; - if (var0 >= 2) { - Client.isResizable = true; + static boolean method1073(Player var0) { + if (Client.drawPlayerNames == 0) { + return false; + } else if (Message.localPlayer == var0) { + boolean var1 = (Client.drawPlayerNames & 8) != 0; + return var1; } else { - Client.isResizable = false; + return class83.method2072() || GameObject.method3298() && var0.isFriend() || class2.method27() && var0.isClanMember(); } - - if (class43.getWindowedMode() == 1) { - AbstractWorldMapIcon.client.setMaxCanvasSize(765, 503); - } else { - AbstractWorldMapIcon.client.setMaxCanvasSize(7680, 2160); - } - - if (Client.gameState >= 25) { - PacketBufferNode var1 = ModelData0.getPacketBufferNode(ClientPacket.field2218, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(class43.getWindowedMode()); - var1.packetBuffer.writeShort(BoundaryObject.canvasWidth); - var1.packetBuffer.writeShort(WorldMapCacheName.canvasHeight); - Client.packetWriter.addNode(var1); - } - } - @ObfuscatedName("he") + @ObfuscatedName("ip") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "590231719" + signature = "(II)Z", + garbageValue = "1279523682" ) - @Export("calculateMenuBounds") - static void calculateMenuBounds(int var0, int var1) { - int var2 = JagexCache.fontBold12.stringWidth("Choose Option"); - - int var3; - for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { - Font var4 = JagexCache.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]; + static final boolean method1074(int var0) { + if (var0 < 0) { + return false; + } else { + int var1 = Client.menuOpcodes[var0]; + if (var1 >= 2000) { + var1 -= 2000; } - int var6 = var4.stringWidth(var5); - if (var6 > var2) { - var2 = var6; + return var1 == 1007; + } + } + + @ObfuscatedName("ke") + @ObfuscatedSignature( + signature = "([Lha;II)V", + garbageValue = "-1916906326" + ) + @Export("drawModelComponents") + static final void drawModelComponents(Widget[] var0, int var1) { + for (int var2 = 0; var2 < var0.length; ++var2) { + Widget var3 = var0[var2]; + if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !Varcs.isComponentHidden(var3))) { + int var5; + if (var3.type == 0) { + if (!var3.isIf3 && Varcs.isComponentHidden(var3) && var3 != class16.mousedOverWidgetIf1) { + continue; + } + + drawModelComponents(var0, var3.id); + if (var3.children != null) { + drawModelComponents(var3.children, var3.id); + } + + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); + if (var4 != null) { + var5 = var4.group; + if (MusicPatch.loadInterface(var5)) { + drawModelComponents(UserComparator7.Widget_interfaceComponents[var5], -1); + } + } + } + + if (var3.type == 6) { + if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { + boolean var7 = WorldMapData_0.runCs1(var3); + if (var7) { + var5 = var3.sequenceId2; + } else { + var5 = var3.sequenceId; + } + + if (var5 != -1) { + SequenceDefinition var6 = WorldMapSection0.SequenceDefinition_get(var5); + + for (var3.modelFrameCycle += Client.field690; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; LoginPacket.invalidateWidget(var3)) { + var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; + ++var3.modelFrame; + if (var3.modelFrame >= var6.frameIds.length) { + var3.modelFrame -= var6.frameCount; + if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { + var3.modelFrame = 0; + } + } + } + } + } + + if (var3.field2607 != 0 && !var3.isIf3) { + int var8 = var3.field2607 >> 16; + var5 = var3.field2607 << 16 >> 16; + var8 *= Client.field690; + var5 *= Client.field690; + var3.modelAngleX = var8 + var3.modelAngleX & 2047; + var3.modelAngleY = var5 + var3.modelAngleY & 2047; + LoginPacket.invalidateWidget(var3); + } + } } } - var2 += 8; - var3 = Client.menuOptionsCount * 15 + 22; - int var7 = var0 - var2 / 2; - if (var7 + var2 > BoundaryObject.canvasWidth) { - var7 = BoundaryObject.canvasWidth - var2; - } - - if (var7 < 0) { - var7 = 0; - } - - int var8 = var1; - if (var1 + var3 > WorldMapCacheName.canvasHeight) { - var8 = WorldMapCacheName.canvasHeight - var3; - } - - if (var8 < 0) { - var8 = 0; - } - - HealthBar.menuX = var7; - class191.menuY = var8; - TileItemPile.menuWidth = var2; - SoundSystem.menuHeight = Client.menuOptionsCount * 15 + 22; } } diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java index 49964ebef9..499bf7f62f 100644 --- a/runescape-client/src/main/java/MouseRecorder.java +++ b/runescape-client/src/main/java/MouseRecorder.java @@ -1,33 +1,49 @@ +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("br") +@ObfuscatedName("bo") @Implements("MouseRecorder") public class MouseRecorder implements Runnable { - @ObfuscatedName("e") - static int[] field588; - @ObfuscatedName("u") + @ObfuscatedName("bo") + @ObfuscatedGetter( + intValue = 1462457493 + ) + static int field564; + @ObfuscatedName("dt") + @ObfuscatedSignature( + signature = "Lif;" + ) + @Export("archive7") + static Archive archive7; + @ObfuscatedName("ee") + @ObfuscatedGetter( + intValue = -365482057 + ) + @Export("port2") + static int port2; + @ObfuscatedName("f") @Export("isRunning") boolean isRunning; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("lock") Object lock; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -499559501 + intValue = -134768521 ) @Export("index") int index; - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("xs") int[] xs; - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("ys") int[] ys; - @ObfuscatedName("p") + @ObfuscatedName("b") @Export("millis") long[] millis; @@ -41,7 +57,7 @@ public class MouseRecorder implements Runnable { } public void run() { - while (this.isRunning) { + for (; this.isRunning; ServerBuild.method4111(50L)) { synchronized(this.lock) { if (this.index < 500) { this.xs[this.index] = MouseHandler.MouseHandler_x; @@ -50,29 +66,61 @@ public class MouseRecorder implements Runnable { ++this.index; } } - - long var4 = 49L; - - try { - Thread.sleep(var4); - } catch (InterruptedException var7) { - } - - try { - Thread.sleep(1L); - } catch (InterruptedException var6) { - } } } - @ObfuscatedName("jc") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "42" + signature = "(I)Z", + garbageValue = "1809769909" ) - @Export("getTapToDrop") - static boolean getTapToDrop() { - return Client.tapToDrop; + @Export("loadWorlds") + static boolean loadWorlds() { + try { + if (Login.World_request == null) { + Login.World_request = BufferedNetSocket.urlRequester.request(new URL(TextureProvider.field1510)); + } else if (Login.World_request.isDone()) { + byte[] var0 = Login.World_request.getResponse(); + Buffer var1 = new Buffer(var0); + var1.readInt(); + World.World_count = var1.readUnsignedShort(); + class162.World_worlds = new World[World.World_count]; + + World var3; + for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { + var3 = class162.World_worlds[var2] = new World(); + var3.id = var1.readUnsignedShort(); + var3.properties = var1.readInt(); + var3.host = var1.readStringCp1252NullTerminated(); + var3.activity = var1.readStringCp1252NullTerminated(); + var3.location = var1.readUnsignedByte(); + var3.population = var1.readShort(); + } + + class192.sortWorlds(class162.World_worlds, 0, class162.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); + Login.World_request = null; + return true; + } + } catch (Exception var4) { + var4.printStackTrace(); + Login.World_request = null; + } + + return false; + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "171278603" + ) + static void method1187() { + for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var0.obj != null) { + var0.set(); + } + } + } } diff --git a/runescape-client/src/main/java/MouseWheel.java b/runescape-client/src/main/java/MouseWheel.java index d8420503a1..c8dd0b2d66 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("fk") +@ObfuscatedName("fs") @Implements("MouseWheel") public interface MouseWheel { - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1495571934" + garbageValue = "582157405" ) @Export("useRotation") int useRotation(); diff --git a/runescape-client/src/main/java/MouseWheelHandler.java b/runescape-client/src/main/java/MouseWheelHandler.java index da27b33582..10c2abc110 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("ap") +@ObfuscatedName("ad") @Implements("MouseWheelHandler") public final class MouseWheelHandler implements MouseWheel, MouseWheelListener { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 190374331 + intValue = 430182525 ) @Export("rotation") int rotation; @@ -21,30 +21,30 @@ public final class MouseWheelHandler implements MouseWheel, MouseWheelListener { this.rotation = 0; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Ljava/awt/Component;S)V", - garbageValue = "-24898" + signature = "(Ljava/awt/Component;I)V", + garbageValue = "-2097643643" ) @Export("addTo") void addTo(Component var1) { var1.addMouseWheelListener(this); } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(Ljava/awt/Component;I)V", - garbageValue = "-1909851609" + garbageValue = "-1609249963" ) @Export("removeFrom") void removeFrom(Component var1) { var1.removeMouseWheelListener(this); } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1495571934" + garbageValue = "582157405" ) @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 fbef2dd30c..a27d4cefad 100644 --- a/runescape-client/src/main/java/MusicPatch.java +++ b/runescape-client/src/main/java/MusicPatch.java @@ -4,47 +4,55 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gv") +@ObfuscatedName("gp") @Implements("MusicPatch") public class MusicPatch extends Node { - @ObfuscatedName("so") - @Export("foundItemIds") - static short[] foundItemIds; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -2129505551 - ) - int field2489; - @ObfuscatedName("f") + @ObfuscatedName("ob") @ObfuscatedSignature( - signature = "[Lcw;" + signature = "Lfs;" + ) + @Export("mouseWheel") + static MouseWheel mouseWheel; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 1771553099 + ) + static int field2472; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 1175859389 + ) + int field2467; + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "[Lcc;" ) @Export("rawSounds") RawSound[] rawSounds; - @ObfuscatedName("b") - short[] field2485; - @ObfuscatedName("g") - byte[] field2486; - @ObfuscatedName("z") - byte[] field2483; - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "[Lgl;" - ) - MusicPatchNode2[] field2488; - @ObfuscatedName("h") - byte[] field2487; @ObfuscatedName("y") - int[] field2492; + short[] field2464; + @ObfuscatedName("w") + byte[] field2466; + @ObfuscatedName("p") + byte[] field2470; + @ObfuscatedName("b") + @ObfuscatedSignature( + signature = "[Lgt;" + ) + MusicPatchNode2[] field2462; + @ObfuscatedName("e") + byte[] field2468; + @ObfuscatedName("x") + int[] field2469; MusicPatch(byte[] var1) { this.rawSounds = new RawSound[128]; - this.field2485 = new short[128]; - this.field2486 = new byte[128]; - this.field2483 = new byte[128]; - this.field2488 = new MusicPatchNode2[128]; - this.field2487 = new byte[128]; - this.field2492 = new int[128]; + this.field2464 = new short[128]; + this.field2466 = new byte[128]; + this.field2470 = new byte[128]; + this.field2462 = new MusicPatchNode2[128]; + this.field2468 = new byte[128]; + this.field2469 = new int[128]; Buffer var2 = new Buffer(var1); int var3; @@ -91,11 +99,11 @@ public class MusicPatch extends Node { ++var2.offset; ++var9; - byte[] var38 = new byte[var9]; + byte[] var36 = new byte[var9]; int var12; int var14; if (var9 > 1) { - var38[1] = 1; + var36[1] = 1; int var13 = 1; var12 = 2; @@ -111,33 +119,33 @@ public class MusicPatch extends Node { var13 = var15; } - var38[var14] = (byte)var13; + var36[var14] = (byte)var13; } } else { var12 = var9; } - MusicPatchNode2[] var39 = new MusicPatchNode2[var12]; + MusicPatchNode2[] var37 = new MusicPatchNode2[var12]; - MusicPatchNode2 var40; - for (var14 = 0; var14 < var39.length; ++var14) { - var40 = var39[var14] = new MusicPatchNode2(); + MusicPatchNode2 var38; + for (var14 = 0; var14 < var37.length; ++var14) { + var38 = var37[var14] = new MusicPatchNode2(); int var16 = var2.readUnsignedByte(); if (var16 > 0) { - var40.field2404 = new byte[var16 * 2]; + var38.field2385 = new byte[var16 * 2]; } var16 = var2.readUnsignedByte(); if (var16 > 0) { - var40.field2399 = new byte[var16 * 2 + 2]; - var40.field2399[1] = 64; + var38.field2377 = new byte[var16 * 2 + 2]; + var38.field2377[1] = 64; } } var14 = var2.readUnsignedByte(); - byte[] var47 = var14 > 0 ? new byte[var14 * 2] : null; + byte[] var45 = var14 > 0 ? new byte[var14 * 2] : null; var14 = var2.readUnsignedByte(); - byte[] var41 = var14 > 0 ? new byte[var14 * 2] : null; + byte[] var39 = var14 > 0 ? new byte[var14 * 2] : null; int var17; for (var17 = 0; var2.array[var17 + var2.offset] != 0; ++var17) { @@ -157,16 +165,16 @@ public class MusicPatch extends Node { int var20; for (var20 = 0; var20 < 128; ++var20) { var19 += var2.readUnsignedByte(); - this.field2485[var20] = (short)var19; + this.field2464[var20] = (short)var19; } var19 = 0; - short[] var50; + short[] var48; for (var20 = 0; var20 < 128; ++var20) { var19 += var2.readUnsignedByte(); - var50 = this.field2485; - var50[var20] = (short)(var50[var20] + (var19 << 8)); + var48 = this.field2464; + var48[var20] = (short)(var48[var20] + (var19 << 8)); } var20 = 0; @@ -185,9 +193,9 @@ public class MusicPatch extends Node { var22 = var2.readVarInt(); } - var50 = this.field2485; - var50[var23] = (short)(var50[var23] + ((var22 - 1 & 2) << 14)); - this.field2492[var23] = var22; + var48 = this.field2464; + var48[var23] = (short)(var48[var23] + ((var22 - 1 & 2) << 14)); + this.field2469[var23] = var22; --var20; } @@ -197,7 +205,7 @@ public class MusicPatch extends Node { int var24; for (var24 = 0; var24 < 128; ++var24) { - if (this.field2492[var24] != 0) { + if (this.field2469[var24] != 0) { if (var20 == 0) { if (var21 < var4.length) { var20 = var4[var21++]; @@ -208,7 +216,7 @@ public class MusicPatch extends Node { var23 = var2.array[var5++] - 1; } - this.field2487[var24] = (byte)var23; + this.field2468[var24] = (byte)var23; --var20; } } @@ -218,7 +226,7 @@ public class MusicPatch extends Node { var24 = 0; for (int var25 = 0; var25 < 128; ++var25) { - if (this.field2492[var25] != 0) { + if (this.field2469[var25] != 0) { if (var20 == 0) { if (var21 < var7.length) { var20 = var7[var21++]; @@ -229,20 +237,20 @@ public class MusicPatch extends Node { var24 = var2.array[var8++] + 16 << 2; } - this.field2483[var25] = (byte)var24; + this.field2470[var25] = (byte)var24; --var20; } } var20 = 0; var21 = 0; - MusicPatchNode2 var42 = null; + MusicPatchNode2 var40 = null; int var26; for (var26 = 0; var26 < 128; ++var26) { - if (this.field2492[var26] != 0) { + if (this.field2469[var26] != 0) { if (var20 == 0) { - var42 = var39[var38[var21]]; + var40 = var37[var36[var21]]; if (var21 < var10.length) { var20 = var10[var21++]; } else { @@ -250,7 +258,7 @@ public class MusicPatch extends Node { } } - this.field2488[var26] = var42; + this.field2462[var26] = var40; --var20; } } @@ -268,66 +276,66 @@ public class MusicPatch extends Node { var20 = -1; } - if (this.field2492[var27] > 0) { + if (this.field2469[var27] > 0) { var26 = var2.readUnsignedByte() + 1; } } - this.field2486[var27] = (byte)var26; + this.field2466[var27] = (byte)var26; --var20; } - this.field2489 = var2.readUnsignedByte() + 1; + this.field2467 = var2.readUnsignedByte() + 1; MusicPatchNode2 var28; int var29; for (var27 = 0; var27 < var12; ++var27) { - var28 = var39[var27]; - if (var28.field2404 != null) { - for (var29 = 1; var29 < var28.field2404.length; var29 += 2) { - var28.field2404[var29] = var2.readByte(); + var28 = var37[var27]; + if (var28.field2385 != null) { + for (var29 = 1; var29 < var28.field2385.length; var29 += 2) { + var28.field2385[var29] = var2.readByte(); } } - if (var28.field2399 != null) { - for (var29 = 3; var29 < var28.field2399.length - 2; var29 += 2) { - var28.field2399[var29] = var2.readByte(); + if (var28.field2377 != null) { + for (var29 = 3; var29 < var28.field2377.length - 2; var29 += 2) { + var28.field2377[var29] = var2.readByte(); } } } - if (var47 != null) { - for (var27 = 1; var27 < var47.length; var27 += 2) { - var47[var27] = var2.readByte(); + if (var45 != null) { + for (var27 = 1; var27 < var45.length; var27 += 2) { + var45[var27] = var2.readByte(); } } - if (var41 != null) { - for (var27 = 1; var27 < var41.length; var27 += 2) { - var41[var27] = var2.readByte(); + if (var39 != null) { + for (var27 = 1; var27 < var39.length; var27 += 2) { + var39[var27] = var2.readByte(); } } for (var27 = 0; var27 < var12; ++var27) { - var28 = var39[var27]; - if (var28.field2399 != null) { + var28 = var37[var27]; + if (var28.field2377 != null) { var19 = 0; - for (var29 = 2; var29 < var28.field2399.length; var29 += 2) { + for (var29 = 2; var29 < var28.field2377.length; var29 += 2) { var19 = 1 + var19 + var2.readUnsignedByte(); - var28.field2399[var29] = (byte)var19; + var28.field2377[var29] = (byte)var19; } } } for (var27 = 0; var27 < var12; ++var27) { - var28 = var39[var27]; - if (var28.field2404 != null) { + var28 = var37[var27]; + if (var28.field2385 != null) { var19 = 0; - for (var29 = 2; var29 < var28.field2404.length; var29 += 2) { - var19 = 1 + var19 + var2.readUnsignedByte(); - var28.field2404[var29] = (byte)var19; + for (var29 = 2; var29 < var28.field2385.length; var29 += 2) { + var19 = var19 + 1 + var2.readUnsignedByte(); + var28.field2385[var29] = (byte)var19; } } } @@ -336,170 +344,164 @@ public class MusicPatch extends Node { int var32; int var33; int var34; - int var35; - int var36; - int var44; - byte var46; - if (var47 != null) { + int var42; + byte var44; + if (var45 != null) { var19 = var2.readUnsignedByte(); - var47[0] = (byte)var19; + var45[0] = (byte)var19; - for (var27 = 2; var27 < var47.length; var27 += 2) { - var19 = 1 + var19 + var2.readUnsignedByte(); - var47[var27] = (byte)var19; + for (var27 = 2; var27 < var45.length; var27 += 2) { + var19 = var19 + 1 + var2.readUnsignedByte(); + var45[var27] = (byte)var19; } - var46 = var47[0]; - byte var43 = var47[1]; + var44 = var45[0]; + byte var41 = var45[1]; - for (var29 = 0; var29 < var46; ++var29) { - this.field2486[var29] = (byte)(var43 * this.field2486[var29] + 32 >> 6); + for (var29 = 0; var29 < var44; ++var29) { + this.field2466[var29] = (byte)(var41 * this.field2466[var29] + 32 >> 6); } - for (var29 = 2; var29 < var47.length; var29 += 2) { - var30 = var47[var29]; - byte var31 = var47[var29 + 1]; - var32 = var43 * (var30 - var46) + (var30 - var46) / 2; + for (var29 = 2; var29 < var45.length; var29 += 2) { + var30 = var45[var29]; + byte var31 = var45[var29 + 1]; + var32 = var41 * (var30 - var44) + (var30 - var44) / 2; - for (var33 = var46; var33 < var30; ++var33) { - var35 = var30 - var46; - var36 = var32 >>> 31; - var34 = (var36 + var32) / var35 - var36; - this.field2486[var33] = (byte)(var34 * this.field2486[var33] + 32 >> 6); - var32 += var31 - var43; + for (var33 = var44; var33 < var30; ++var33) { + var34 = WorldMapData_0.method164(var32, var30 - var44); + this.field2466[var33] = (byte)(var34 * this.field2466[var33] + 32 >> 6); + var32 += var31 - var41; } - var46 = var30; - var43 = var31; + var44 = var30; + var41 = var31; } - for (var44 = var46; var44 < 128; ++var44) { - this.field2486[var44] = (byte)(var43 * this.field2486[var44] + 32 >> 6); + for (var42 = var44; var42 < 128; ++var42) { + this.field2466[var42] = (byte)(var41 * this.field2466[var42] + 32 >> 6); } - var40 = null; + var38 = null; } - if (var41 != null) { + if (var39 != null) { var19 = var2.readUnsignedByte(); - var41[0] = (byte)var19; + var39[0] = (byte)var19; - for (var27 = 2; var27 < var41.length; var27 += 2) { - var19 = 1 + var19 + var2.readUnsignedByte(); - var41[var27] = (byte)var19; + for (var27 = 2; var27 < var39.length; var27 += 2) { + var19 = var19 + 1 + var2.readUnsignedByte(); + var39[var27] = (byte)var19; } - var46 = var41[0]; - int var49 = var41[1] << 1; + var44 = var39[0]; + int var47 = var39[1] << 1; - for (var29 = 0; var29 < var46; ++var29) { - var44 = var49 + (this.field2483[var29] & 255); - if (var44 < 0) { - var44 = 0; + for (var29 = 0; var29 < var44; ++var29) { + var42 = var47 + (this.field2470[var29] & 255); + if (var42 < 0) { + var42 = 0; } - if (var44 > 128) { - var44 = 128; + if (var42 > 128) { + var42 = 128; } - this.field2483[var29] = (byte)var44; + this.field2470[var29] = (byte)var42; } - int var45; - for (var29 = 2; var29 < var41.length; var29 += 2) { - var30 = var41[var29]; - var45 = var41[var29 + 1] << 1; - var32 = var49 * (var30 - var46) + (var30 - var46) / 2; + int var43; + for (var29 = 2; var29 < var39.length; var29 += 2) { + var30 = var39[var29]; + var43 = var39[var29 + 1] << 1; + var32 = var47 * (var30 - var44) + (var30 - var44) / 2; - for (var33 = var46; var33 < var30; ++var33) { - var35 = var30 - var46; - var36 = var32 >>> 31; - var34 = (var36 + var32) / var35 - var36; - int var37 = var34 + (this.field2483[var33] & 255); - if (var37 < 0) { - var37 = 0; + for (var33 = var44; var33 < var30; ++var33) { + var34 = WorldMapData_0.method164(var32, var30 - var44); + int var35 = var34 + (this.field2470[var33] & 255); + if (var35 < 0) { + var35 = 0; } - if (var37 > 128) { - var37 = 128; + if (var35 > 128) { + var35 = 128; } - this.field2483[var33] = (byte)var37; - var32 += var45 - var49; + this.field2470[var33] = (byte)var35; + var32 += var43 - var47; } - var46 = var30; - var49 = var45; + var44 = var30; + var47 = var43; } - for (var44 = var46; var44 < 128; ++var44) { - var45 = var49 + (this.field2483[var44] & 255); - if (var45 < 0) { - var45 = 0; + for (var42 = var44; var42 < 128; ++var42) { + var43 = var47 + (this.field2470[var42] & 255); + if (var43 < 0) { + var43 = 0; } - if (var45 > 128) { - var45 = 128; + if (var43 > 128) { + var43 = 128; } - this.field2483[var44] = (byte)var45; + this.field2470[var42] = (byte)var43; } - Object var48 = null; + Object var46 = null; } for (var27 = 0; var27 < var12; ++var27) { - var39[var27].field2400 = var2.readUnsignedByte(); + var37[var27].field2378 = var2.readUnsignedByte(); } for (var27 = 0; var27 < var12; ++var27) { - var28 = var39[var27]; - if (var28.field2404 != null) { - var28.field2398 = var2.readUnsignedByte(); + var28 = var37[var27]; + if (var28.field2385 != null) { + var28.field2387 = var2.readUnsignedByte(); } - if (var28.field2399 != null) { - var28.field2407 = var2.readUnsignedByte(); + if (var28.field2377 != null) { + var28.field2376 = var2.readUnsignedByte(); } - if (var28.field2400 > 0) { - var28.field2403 = var2.readUnsignedByte(); + if (var28.field2378 > 0) { + var28.field2384 = var2.readUnsignedByte(); } } for (var27 = 0; var27 < var12; ++var27) { - var39[var27].field2405 = var2.readUnsignedByte(); + var37[var27].field2383 = var2.readUnsignedByte(); } for (var27 = 0; var27 < var12; ++var27) { - var28 = var39[var27]; - if (var28.field2405 > 0) { - var28.field2401 = var2.readUnsignedByte(); + var28 = var37[var27]; + if (var28.field2383 > 0) { + var28.field2382 = var2.readUnsignedByte(); } } for (var27 = 0; var27 < var12; ++var27) { - var28 = var39[var27]; - if (var28.field2401 > 0) { - var28.field2402 = var2.readUnsignedByte(); + var28 = var37[var27]; + if (var28.field2382 > 0) { + var28.field2380 = var2.readUnsignedByte(); } } } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Ldk;[B[II)Z", - garbageValue = "-1839137697" + signature = "(Ldx;[B[II)Z", + garbageValue = "-402294564" ) - boolean method3952(SoundCache var1, byte[] var2, int[] var3) { + boolean method3868(SoundCache var1, byte[] var2, int[] var3) { boolean var4 = true; int var5 = 0; RawSound var6 = null; for (int var7 = 0; var7 < 128; ++var7) { if (var2 == null || var2[var7] != 0) { - int var8 = this.field2492[var7]; + int var8 = this.field2469[var7]; if (var8 != 0) { if (var5 != var8) { var5 = var8--; @@ -516,7 +518,7 @@ public class MusicPatch extends Node { if (var6 != null) { this.rawSounds[var7] = var6; - this.field2492[var7] = 0; + this.field2469[var7] = 0; } } } @@ -525,13 +527,55 @@ public class MusicPatch extends Node { return var4; } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1390506407" + signature = "(B)V", + garbageValue = "7" ) @Export("clear") void clear() { - this.field2492 = null; + this.field2469 = null; + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "(IB)Z", + garbageValue = "0" + ) + @Export("loadInterface") + public static boolean loadInterface(int var0) { + if (Widget.Widget_loadedInterfaces[var0]) { + return true; + } else if (!FriendLoginUpdate.Widget_archive.tryLoadGroup(var0)) { + return false; + } else { + int var1 = FriendLoginUpdate.Widget_archive.getGroupFileCount(var0); + if (var1 == 0) { + Widget.Widget_loadedInterfaces[var0] = true; + return true; + } else { + if (UserComparator7.Widget_interfaceComponents[var0] == null) { + UserComparator7.Widget_interfaceComponents[var0] = new Widget[var1]; + } + + for (int var2 = 0; var2 < var1; ++var2) { + if (UserComparator7.Widget_interfaceComponents[var0][var2] == null) { + byte[] var3 = FriendLoginUpdate.Widget_archive.takeFile(var0, var2); + if (var3 != null) { + UserComparator7.Widget_interfaceComponents[var0][var2] = new Widget(); + UserComparator7.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); + if (var3[0] == -1) { + UserComparator7.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); + } else { + UserComparator7.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); + } + } + } + } + + Widget.Widget_loadedInterfaces[var0] = true; + return true; + } + } } } diff --git a/runescape-client/src/main/java/MusicPatchNode.java b/runescape-client/src/main/java/MusicPatchNode.java index f3be798276..ee792d5c82 100644 --- a/runescape-client/src/main/java/MusicPatchNode.java +++ b/runescape-client/src/main/java/MusicPatchNode.java @@ -4,159 +4,196 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ge") +@ObfuscatedName("gl") @Implements("MusicPatchNode") public class MusicPatchNode extends Node { - @ObfuscatedName("pr") - @ObfuscatedSignature( - signature = "Lkc;" - ) - @Export("privateChatMode") - static PrivateChatMode privateChatMode; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 58684745 - ) - int field2449; @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -1668563715 + ) + int field2444; + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgp;" ) @Export("patch") MusicPatch patch; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lcw;" + signature = "Lcc;" ) @Export("rawSound") RawSound rawSound; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lgl;" + signature = "Lgt;" ) - MusicPatchNode2 field2448; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -554118983 - ) - int field2445; + MusicPatchNode2 field2430; @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 964723385 + intValue = 1764102469 ) - int field2450; - @ObfuscatedName("h") + int field2436; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1158780531 + intValue = 1904799079 ) - int field2451; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = 1961661549 - ) - int field2452; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -1743896361 - ) - int field2465; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -1656176453 - ) - int field2454; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -146534819 - ) - int field2455; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 671001671 - ) - int field2456; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 1362014437 - ) - int field2457; + int field2432; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1068746099 + intValue = -520754743 ) - int field2458; - @ObfuscatedName("n") + int field2433; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -362402475 + intValue = 2093202959 ) - int field2459; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = 1829652009 - ) - int field2460; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -1900705041 - ) - int field2461; + int field2442; @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1048414071 + intValue = -583711797 ) - int field2462; + int field2435; @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 1078533747 + ) + int field2434; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 1604483671 + ) + int field2437; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 850603648 + ) + int field2446; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -2031818959 + ) + int field2439; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -2089703245 + ) + int field2440; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 1525536893 + ) + int field2441; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 2143994261 + ) + int field2438; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 1974206537 + ) + int field2443; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -1464754039 + ) + int field2427; + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lds;" + signature = "Ldg;" ) @Export("stream") RawPcmStream stream; - @ObfuscatedName("s") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 871159735 + intValue = -322620881 ) - int field2464; - @ObfuscatedName("m") + int field2431; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 809397821 + intValue = -966369817 ) - int field2463; + int field2447; MusicPatchNode() { } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "786622629" + signature = "(S)V", + garbageValue = "300" ) - void method3893() { + void method3809() { this.patch = null; this.rawSound = null; - this.field2448 = null; + this.field2430 = null; this.stream = null; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(II)Lio;", - garbageValue = "1955258484" + signature = "(II)Lid;", + garbageValue = "1715328596" ) - @Export("getParamDefinition") - public static ParamDefinition getParamDefinition(int var0) { - ParamDefinition var1 = (ParamDefinition)ParamDefinition.ParamDefinition_cached.get((long)var0); + public static HitSplatDefinition method3815(int var0) { + HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); if (var1 != null) { return var1; } else { - byte[] var2 = ParamDefinition.ParamDefinition_archive.takeFile(11, var0); - var1 = new ParamDefinition(); + byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); + var1 = new HitSplatDefinition(); if (var2 != null) { var1.decode(new Buffer(var2)); } - var1.postDecode(); - ParamDefinition.ParamDefinition_cached.put(var1, (long)var0); + HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); return var1; } } + + @ObfuscatedName("b") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "512753699" + ) + public static int method3814() { + return KeyHandler.KeyHandler_idleCycles; + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(Ldw;IIIS)Z", + garbageValue = "-6878" + ) + static final boolean method3813(Model var0, int var1, int var2, int var3) { + boolean var4 = ViewportMouse.ViewportMouse_isInViewport; + if (!var4) { + return false; + } else { + WorldMapEvent.method764(); + int var5 = var0.xMid + var1; + int var6 = var2 + var0.yMid; + int var7 = var3 + var0.zMid; + int var8 = var0.xMidOffset; + int var9 = var0.yMidOffset; + int var10 = var0.zMidOffset; + int var11 = ViewportMouse.field1717 - var5; + int var12 = class30.field245 - var6; + int var13 = ViewportMouse.field1718 - var7; + if (Math.abs(var11) > var8 + ViewportMouse.field1720) { + return false; + } else if (Math.abs(var12) > var9 + class247.field3261) { + return false; + } else if (Math.abs(var13) > var10 + MusicPatch.field2472) { + return false; + } else if (Math.abs(var13 * WorldMapCacheName.field293 - var12 * class40.field336) > var9 * MusicPatch.field2472 + var10 * class247.field3261) { + return false; + } else if (Math.abs(var11 * class40.field336 - var13 * ViewportMouse.field1719) > var8 * MusicPatch.field2472 + var10 * ViewportMouse.field1720) { + return false; + } else { + return Math.abs(var12 * ViewportMouse.field1719 - var11 * WorldMapCacheName.field293) <= var8 * class247.field3261 + var9 * ViewportMouse.field1720; + } + } + } } diff --git a/runescape-client/src/main/java/MusicPatchNode2.java b/runescape-client/src/main/java/MusicPatchNode2.java index 090aa7762f..b24700bd89 100644 --- a/runescape-client/src/main/java/MusicPatchNode2.java +++ b/runescape-client/src/main/java/MusicPatchNode2.java @@ -3,476 +3,107 @@ 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("gl") +@ObfuscatedName("gt") @Implements("MusicPatchNode2") public class MusicPatchNode2 { - @ObfuscatedName("u") - byte[] field2404; + @ObfuscatedName("dz") + @ObfuscatedSignature( + signature = "Lif;" + ) + @Export("archive19") + static Archive archive19; + @ObfuscatedName("hx") + @ObfuscatedGetter( + intValue = -1785627297 + ) + @Export("cameraX") + static int cameraX; @ObfuscatedName("f") - byte[] field2399; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 961983705 - ) - int field2400; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -1534544583 - ) - int field2398; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = 1071717921 - ) - int field2407; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -461234171 - ) - int field2403; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -1881467047 - ) - int field2401; + byte[] field2385; + @ObfuscatedName("i") + byte[] field2377; @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 972491085 + intValue = 1329513341 ) - int field2405; + int field2378; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 381719823 + intValue = 12708137 ) - int field2402; + int field2387; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 1693996309 + ) + int field2376; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 1410109429 + ) + int field2384; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 2019355135 + ) + int field2382; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 27248727 + ) + int field2383; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = -1172401863 + ) + int field2380; MusicPatchNode2() { } - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1982714060" + signature = "(B)V", + garbageValue = "-69" ) - public static void method3750() { - if (KeyHandler.KeyHandler_instance != null) { - synchronized(KeyHandler.KeyHandler_instance) { - KeyHandler.KeyHandler_instance = null; - } - } - + static void method3669() { + class14.field88 = null; + Tiles.field498 = null; + Tiles.field494 = null; + Tiles.field493 = null; + Tiles.field501 = null; + Tiles.field496 = null; + ArchiveLoader.field512 = null; + UrlRequest.Tiles_hue = null; + MenuAction.Tiles_saturation = null; + PacketBufferNode.Tiles_lightness = null; + Tiles.Tiles_hueMultiplier = null; + Varcs.field1244 = null; } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-847322953" + signature = "(B)V", + garbageValue = "1" ) - @Export("Messages_getHistorySize") - static int Messages_getHistorySize(int var0) { - ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); - return var1 == null ? 0 : var1.size(); + public static void method3668() { + SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); + SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); } - @ObfuscatedName("aa") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(ILci;ZI)I", - garbageValue = "1322591078" + signature = "(Lkq;J)V" ) - static int method3747(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.publicChatMode; - return 1; - } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 3; - Client.publicChatMode = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - MusicPatchNode.privateChatMode = User.method5131(Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]); - if (MusicPatchNode.privateChatMode == null) { - MusicPatchNode.privateChatMode = PrivateChatMode.field3792; - } - - Client.tradeChatMode = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 2]; - PacketBufferNode var18 = ModelData0.getPacketBufferNode(ClientPacket.field2270, Client.packetWriter.isaacCipher); - var18.packetBuffer.writeByte(Client.publicChatMode); - var18.packetBuffer.writeByte(MusicPatchNode.privateChatMode.field3795); - 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[--class43.Interpreter_stringStackSize]; - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - int var5 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - PacketBufferNode var6 = ModelData0.getPacketBufferNode(ClientPacket.field2312, Client.packetWriter.isaacCipher); - var6.packetBuffer.writeByte(class173.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) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var10 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - Message var15 = class197.Messages_getByChannelAndID(var10, var4); - if (var15 != null) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var15.count; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var15.cycle; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var15.sender != null ? var15.sender : ""; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var15.prefix != null ? var15.prefix : ""; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var15.text != null ? var15.text : ""; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var15.isFromFriend() ? 1 : (var15.isFromIgnored() ? 2 : 0); - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { - var10 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Message var16 = class286.Messages_getMessage(var10); - if (var16 != null) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var16.type; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var16.cycle; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var16.sender != null ? var16.sender : ""; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var16.prefix != null ? var16.prefix : ""; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var16.text != null ? var16.text : ""; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var16.isFromFriend() ? 1 : (var16.isFromIgnored() ? 2 : 0); - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { - if (MusicPatchNode.privateChatMode == null) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = MusicPatchNode.privateChatMode.field3795; - } - - return 1; - } else if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { - var3 = Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.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 (VarbitDefinition.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 (VarbitDefinition.clientLanguage != Language.Language_EN) { - if (var14.startsWith("wave:")) { - var7 = 1; - var3 = var3.substring("wave:".length()); - } else if (var14.startsWith("wave2:")) { - var7 = 2; - var3 = var3.substring("wave2:".length()); - } else if (var14.startsWith("shake:")) { - var7 = 3; - var3 = var3.substring("shake:".length()); - } else if (var14.startsWith("scroll:")) { - var7 = 4; - var3 = var3.substring("scroll:".length()); - } else if (var14.startsWith("slide:")) { - var7 = 5; - var3 = var3.substring("slide:".length()); - } - } - - PacketBufferNode var8 = ModelData0.getPacketBufferNode(ClientPacket.field2305, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeByte(0); - int var9 = var8.packetBuffer.offset; - var8.packetBuffer.writeByte(var4); - var8.packetBuffer.writeByte(var17); - var8.packetBuffer.writeByte(var7); - class289.method5388(var8.packetBuffer, var3); - var8.packetBuffer.writeLengthByte(var8.packetBuffer.offset - var9); - Client.packetWriter.addNode(var8); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { - class43.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[class43.Interpreter_stringStackSize]; - String var12 = Interpreter.Interpreter_stringStack[class43.Interpreter_stringStackSize + 1]; - PacketBufferNode var11 = ModelData0.getPacketBufferNode(ClientPacket.field2229, Client.packetWriter.isaacCipher); - var11.packetBuffer.writeShort(0); - int var13 = var11.packetBuffer.offset; - var11.packetBuffer.writeStringCp1252NullTerminated(var3); - class289.method5388(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[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.tradeChatMode; - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { - var10 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Messages_getHistorySize(var10); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { - var10 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = class40.Messages_getNextChatID(var10); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { - var10 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = CollisionMap.Messages_getLastChatID(var10); - return 1; - } else if (var0 == ScriptOpcodes.DOCHEAT) { - var3 = Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]; - class13.doCheat(var3); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { - Client.field860 = Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize].toLowerCase().trim(); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = Client.field860; - return 1; - } else if (var0 == ScriptOpcodes.DEBUGMES) { - var3 = Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]; - System.out.println(var3); - return 1; - } else { - return 2; - } - } else { - if (class215.localPlayer != null && class215.localPlayer.username != null) { - var3 = class215.localPlayer.username.getName(); - } else { - var3 = ""; - } - - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var3; - return 1; - } - } + static void method3670(Buffer var0, long var1) { + var1 /= 10L; + if (var1 < 0L) { + var1 = 0L; + } else if (var1 > 65535L) { + var1 = 65535L; } - } - @ObfuscatedName("kh") - @ObfuscatedSignature( - signature = "(Lhl;IIII)V", - garbageValue = "1306895592" - ) - @Export("drawMinimap") - static final void drawMinimap(Widget var0, int var1, int var2, int var3) { - Tiles.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 = class215.localPlayer.x / 32 + 48; - int var7 = 464 - class215.localPlayer.y / 32; - Interpreter.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 - class215.localPlayer.x / 32; - var10 = Client.mapIconYs[var8] * 4 + 2 - class215.localPlayer.y / 32; - class185.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[ClientPacket.Client_plane][var8][var9]; - if (var15 != null) { - var11 = var8 * 4 + 2 - class215.localPlayer.x / 32; - var12 = var9 * 4 + 2 - class215.localPlayer.y / 32; - class185.drawSpriteOnMinimap(var1, var2, var11, var12, WorldMapData_0.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 - class215.localPlayer.x / 32; - var12 = var16.y / 32 - class215.localPlayer.y / 32; - class185.drawSpriteOnMinimap(var1, var2, var11, var12, WorldMapData_0.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 != class215.localPlayer) { - var12 = var17.x / 32 - class215.localPlayer.x / 32; - int var13 = var17.y / 32 - class215.localPlayer.y / 32; - boolean var14 = false; - if (class215.localPlayer.team != 0 && var17.team != 0 && var17.team == class215.localPlayer.team) { - var14 = true; - } - - if (var17.isFriend()) { - class185.drawSpriteOnMinimap(var1, var2, var12, var13, WorldMapData_0.mapDotSprites[3], var4); - } else if (var14) { - class185.drawSpriteOnMinimap(var1, var2, var12, var13, WorldMapData_0.mapDotSprites[4], var4); - } else if (var17.isClanMember()) { - class185.drawSpriteOnMinimap(var1, var2, var12, var13, WorldMapData_0.mapDotSprites[5], var4); - } else { - class185.drawSpriteOnMinimap(var1, var2, var12, var13, WorldMapData_0.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 - class215.localPlayer.x / 32; - var12 = var20.y / 32 - class215.localPlayer.y / 32; - WorldMapIcon_0.worldToMinimap(var1, var2, var11, var12, AttackOption.mapMarkerSprites[1], var4); - } - } - - if (Client.hintArrowType == 2) { - var10 = Client.hintArrowX * 4 - class51.baseX * 256 + 2 - class215.localPlayer.x / 32; - var11 = Client.hintArrowY * 4 - VarcInt.baseY * 256 + 2 - class215.localPlayer.y / 32; - WorldMapIcon_0.worldToMinimap(var1, var2, var10, var11, AttackOption.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 - class215.localPlayer.x / 32; - var12 = var21.y / 32 - class215.localPlayer.y / 32; - WorldMapIcon_0.worldToMinimap(var1, var2, var11, var12, AttackOption.mapMarkerSprites[1], var4); - } - } - } - - if (Client.destinationX != 0) { - var10 = Client.destinationX * 4 + 2 - class215.localPlayer.x / 32; - var11 = Client.destinationY * 4 + 2 - class215.localPlayer.y / 32; - class185.drawSpriteOnMinimap(var1, var2, var10, var11, AttackOption.mapMarkerSprites[0], var4); - } - - if (!class215.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.field837[var3] = true; - } + var0.writeShort((int)var1); } } diff --git a/runescape-client/src/main/java/MusicPatchPcmStream.java b/runescape-client/src/main/java/MusicPatchPcmStream.java index 912620735c..3634bce1fd 100644 --- a/runescape-client/src/main/java/MusicPatchPcmStream.java +++ b/runescape-client/src/main/java/MusicPatchPcmStream.java @@ -1,32 +1,39 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gr") +@ObfuscatedName("gy") @Implements("MusicPatchPcmStream") public class MusicPatchPcmStream extends PcmStream { - @ObfuscatedName("u") + @ObfuscatedName("fb") + @ObfuscatedGetter( + intValue = 310366357 + ) + @Export("baseX") + static int baseX; + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lgz;" + signature = "Lgm;" ) @Export("superStream") MidiPcmStream superStream; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Ljd;" + signature = "Ljs;" ) @Export("queue") NodeDeque queue; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lca;" + signature = "Lcy;" ) @Export("mixer") PcmStreamMixer mixer; @ObfuscatedSignature( - signature = "(Lgz;)V" + signature = "(Lgm;)V" ) MusicPatchPcmStream(MidiPcmStream var1) { this.queue = new NodeDeque(); @@ -34,48 +41,48 @@ public class MusicPatchPcmStream extends PcmStream { this.superStream = var1; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Lge;[IIIII)V", - garbageValue = "71906833" + signature = "(Lgl;[IIIII)V", + garbageValue = "2129262150" ) - void method3962(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { - if ((this.superStream.field2428[var1.field2449] & 4) != 0 && var1.field2459 < 0) { - int var6 = this.superStream.field2433[var1.field2449] / Messages.PcmPlayer_sampleRate; + void method3879(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { + if ((this.superStream.field2412[var1.field2444] & 4) != 0 && var1.field2441 < 0) { + int var6 = this.superStream.field2425[var1.field2444] / (DirectByteArrayCopier.field2490 * -168449264); while (true) { - int var7 = (var6 + 1048575 - var1.field2463) / var6; + int var7 = (var6 + 1048575 - var1.field2447) / var6; if (var7 > var4) { - var1.field2463 += var6 * var4; + var1.field2447 += var4 * var6; break; } var1.stream.fill(var2, var3, var7); var3 += var7; var4 -= var7; - var1.field2463 += var7 * var6 - 1048576; - int var8 = Messages.PcmPlayer_sampleRate / 100; + var1.field2447 += var6 * var7 - 1048576; + int var8 = DirectByteArrayCopier.field2490 * -168449264 / 100; int var9 = 262144 / var6; if (var9 < var8) { var8 = var9; } RawPcmStream var10 = var1.stream; - if (this.superStream.field2441[var1.field2449] == 0) { - var1.stream = RawPcmStream.method2568(var1.rawSound, var10.method2701(), var10.method2575(), var10.method2576()); + if (this.superStream.field2415[var1.field2444] == 0) { + var1.stream = RawPcmStream.method2582(var1.rawSound, var10.method2561(), var10.method2609(), var10.method2553()); } else { - var1.stream = RawPcmStream.method2568(var1.rawSound, var10.method2701(), 0, var10.method2576()); - this.superStream.method3779(var1, var1.patch.field2485[var1.field2450] < 0); - var1.stream.method2580(var8, var10.method2575()); + var1.stream = RawPcmStream.method2582(var1.rawSound, var10.method2561(), 0, var10.method2553()); + this.superStream.method3764(var1, var1.patch.field2464[var1.field2432] < 0); + var1.stream.method2557(var8, var10.method2609()); } - if (var1.patch.field2485[var1.field2450] < 0) { + if (var1.patch.field2464[var1.field2432] < 0) { var1.stream.setNumLoops(-1); } - var10.method2582(var8); + var10.method2559(var8); var10.fill(var2, var3, var5 - var3); - if (var10.method2686()) { + if (var10.method2563()) { this.mixer.addSubStream(var10); } } @@ -84,38 +91,38 @@ public class MusicPatchPcmStream extends PcmStream { var1.stream.fill(var2, var3, var4); } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lge;II)V", - garbageValue = "-1756065596" + signature = "(Lgl;II)V", + garbageValue = "-1324133665" ) - void method3959(MusicPatchNode var1, int var2) { - if ((this.superStream.field2428[var1.field2449] & 4) != 0 && var1.field2459 < 0) { - int var3 = this.superStream.field2433[var1.field2449] / Messages.PcmPlayer_sampleRate; - int var4 = (var3 + 1048575 - var1.field2463) / var3; - var1.field2463 = var3 * var2 + var1.field2463 & 1048575; + void method3880(MusicPatchNode var1, int var2) { + if ((this.superStream.field2412[var1.field2444] & 4) != 0 && var1.field2441 < 0) { + int var3 = this.superStream.field2425[var1.field2444] / (DirectByteArrayCopier.field2490 * -168449264); + int var4 = (var3 + 1048575 - var1.field2447) / var3; + var1.field2447 = var3 * var2 + var1.field2447 & 1048575; if (var4 <= var2) { - if (this.superStream.field2441[var1.field2449] == 0) { - var1.stream = RawPcmStream.method2568(var1.rawSound, var1.stream.method2701(), var1.stream.method2575(), var1.stream.method2576()); + if (this.superStream.field2415[var1.field2444] == 0) { + var1.stream = RawPcmStream.method2582(var1.rawSound, var1.stream.method2561(), var1.stream.method2609(), var1.stream.method2553()); } else { - var1.stream = RawPcmStream.method2568(var1.rawSound, var1.stream.method2701(), 0, var1.stream.method2576()); - this.superStream.method3779(var1, var1.patch.field2485[var1.field2450] < 0); + var1.stream = RawPcmStream.method2582(var1.rawSound, var1.stream.method2561(), 0, var1.stream.method2553()); + this.superStream.method3764(var1, var1.patch.field2464[var1.field2432] < 0); } - if (var1.patch.field2485[var1.field2450] < 0) { + if (var1.patch.field2464[var1.field2432] < 0) { var1.stream.setNumLoops(-1); } - var2 = var1.field2463 / var3; + var2 = var1.field2447 / var3; } } var1.stream.skip(var2); } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "()Ldt;" + signature = "()Ldl;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { @@ -127,9 +134,9 @@ public class MusicPatchPcmStream extends PcmStream { } } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "()Ldt;" + signature = "()Ldl;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { @@ -144,134 +151,85 @@ public class MusicPatchPcmStream extends PcmStream { return var1.stream; } - @ObfuscatedName("y") - protected int vmethod3963() { + @ObfuscatedName("x") + protected int vmethod3889() { return 0; } - @ObfuscatedName("w") + @ObfuscatedName("a") @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.method3801(var6)) { + if (!this.superStream.method3767(var6)) { int var4 = var2; int var5 = var3; do { - if (var5 <= var6.field2464) { - this.method3962(var6, var1, var4, var5, var4 + var5); - var6.field2464 -= var5; + if (var5 <= var6.field2431) { + this.method3879(var6, var1, var4, var5, var5 + var4); + var6.field2431 -= var5; break; } - this.method3962(var6, var1, var4, var6.field2464, var5 + var4); - var4 += var6.field2464; - var5 -= var6.field2464; - } while(!this.superStream.method3802(var6, var1, var4, var5)); + this.method3879(var6, var1, var4, var6.field2431, var5 + var4); + var4 += var6.field2431; + var5 -= var6.field2431; + } while(!this.superStream.method3728(var6, var1, var4, var5)); } } } - @ObfuscatedName("k") + @ObfuscatedName("c") @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.method3801(var3)) { + if (!this.superStream.method3767(var3)) { int var2 = var1; do { - if (var2 <= var3.field2464) { - this.method3959(var3, var2); - var3.field2464 -= var2; + if (var2 <= var3.field2431) { + this.method3880(var3, var2); + var3.field2431 -= var2; break; } - this.method3959(var3, var3.field2464); - var2 -= var3.field2464; - } while(!this.superStream.method3802(var3, (int[])null, 0, var2)); + this.method3880(var3, var3.field2431); + var2 -= var3.field2431; + } while(!this.superStream.method3728(var3, (int[])null, 0, var2)); } } } - @ObfuscatedName("i") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "2088292857" + signature = "(I)[Lhp;", + garbageValue = "1994123729" ) - public static void method3970() { - PlayerAppearance.PlayerAppearance_cachedModels.clear(); + @Export("PlayerType_values") + public static PlayerType[] PlayerType_values() { + return new PlayerType[]{PlayerType.PlayerType_ironman, PlayerType.PlayerType_normal, PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_playerModerator, PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_ultimateIronman}; } - @ObfuscatedName("jh") + @ObfuscatedName("im") @ObfuscatedSignature( - signature = "([Lhl;II)V", - garbageValue = "1264481635" + signature = "(IB)V", + garbageValue = "96" ) - @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 || !AbstractByteArrayCopier.isComponentHidden(var3))) { - if (var3.type == 0) { - if (!var3.isIf3 && AbstractByteArrayCopier.isComponentHidden(var3) && var3 != class185.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) { - class160.method3494(var4.group); - } - } - - if (var3.type == 6) { - int var5; - if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { - boolean var7 = WorldMapArea.runCs1(var3); - if (var7) { - var5 = var3.sequenceId2; - } else { - var5 = var3.sequenceId; - } - - if (var5 != -1) { - SequenceDefinition var6 = GrandExchangeOfferAgeComparator.SequenceDefinition_get(var5); - - for (var3.modelFrameCycle += Client.field704; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; ScriptEvent.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.field2633 != 0 && !var3.isIf3) { - int var8 = var3.field2633 >> 16; - var5 = var3.field2633 << 16 >> 16; - var8 *= Client.field704; - var5 *= Client.field704; - var3.modelAngleX = var8 + var3.modelAngleX & 2047; - var3.modelAngleY = var5 + var3.modelAngleY & 2047; - ScriptEvent.invalidateWidget(var3); - } - } - } + static final void method3898(int var0) { + if (var0 >= 0) { + int var1 = Client.menuArguments1[var0]; + int var2 = Client.menuArguments2[var0]; + int var3 = Client.menuOpcodes[var0]; + int var4 = Client.menuIdentifiers[var0]; + String var5 = Client.menuActions[var0]; + String var6 = Client.menuTargets[var0]; + AbstractWorldMapData.menuAction(var1, var2, var3, var4, var5, var6, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); } - } } diff --git a/runescape-client/src/main/java/MusicTrack.java b/runescape-client/src/main/java/MusicTrack.java index 6b6a84523d..d9e863a09c 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("gt") +@ObfuscatedName("gh") @Implements("MusicTrack") public class MusicTrack extends Node { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lle;" ) @Export("table") NodeHashTable table; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("midi") byte[] midi; @ObfuscatedSignature( - signature = "(Lkg;)V" + signature = "(Lkq;)V" ) MusicTrack(Buffer var1) { var1.offset = var1.array.length - 3; @@ -196,7 +196,7 @@ public class MusicTrack extends Node { int[] var59 = new int[128]; var28 = 0; - label227: + label229: for (int var60 = 0; var60 < var2; ++var60) { var51.writeInt(1297379947); var51.offset += 4; @@ -218,7 +218,7 @@ public class MusicTrack extends Node { var51.writeByte(47); var51.writeByte(0); var51.writeLengthInt(var51.offset - var61); - continue label227; + continue label229; } if (var64 == 23) { @@ -335,8 +335,8 @@ public class MusicTrack extends Node { } - @ObfuscatedName("f") - void method3987() { + @ObfuscatedName("i") + void method3909() { if (this.table == null) { this.table = new NodeHashTable(16); int[] var1 = new int[16]; @@ -416,18 +416,18 @@ public class MusicTrack extends Node { } } - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("clear") void clear() { this.table = null; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Lhf;II)Lgt;" + signature = "(Lhz;II)Lgh;" ) @Export("readTrack") - public static MusicTrack readTrack(AbstractArchive var0, int var1, int var2) { + static MusicTrack readTrack(AbstractArchive var0, int var1, int var2) { byte[] var3 = var0.takeFile(var1, var2); return var3 == null ? null : new MusicTrack(new Buffer(var3)); } diff --git a/runescape-client/src/main/java/NPC.java b/runescape-client/src/main/java/NPC.java index 1fae83f47d..1eed5272e4 100644 --- a/runescape-client/src/main/java/NPC.java +++ b/runescape-client/src/main/java/NPC.java @@ -1,26 +1,20 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cd") +@ObfuscatedName("cp") @Implements("NPC") public final class NPC extends Actor { - @ObfuscatedName("se") - @ObfuscatedSignature( - signature = "Llj;" + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 390634291 ) - @Export("platformInfo") - static PlatformInfo platformInfo; - @ObfuscatedName("o") + public static int field1103; + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Ldk;" - ) - @Export("soundCache") - public static SoundCache soundCache; - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lih;" + signature = "Liw;" ) @Export("definition") NPCDefinition definition; @@ -28,12 +22,12 @@ public final class NPC extends Actor { NPC() { } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "(IBI)V", - garbageValue = "1878117955" + garbageValue = "-1410732452" ) - final void method2058(int var1, byte var2) { + final void method2044(int var1, byte var2) { int var3 = super.pathX[0]; int var4 = super.pathY[0]; if (var1 == 0) { @@ -72,7 +66,7 @@ public final class NPC extends Actor { --var4; } - if (super.sequence != -1 && GrandExchangeOfferAgeComparator.SequenceDefinition_get(super.sequence).field3515 == 1) { + if (super.sequence != -1 && WorldMapSection0.SequenceDefinition_get(super.sequence).field3493 == 1) { super.sequence = -1; } @@ -91,13 +85,13 @@ public final class NPC extends Actor { super.pathTraversed[0] = var2; } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IIZB)V", - garbageValue = "79" + signature = "(IIZI)V", + garbageValue = "-619180263" ) - final void method2059(int var1, int var2, boolean var3) { - if (super.sequence != -1 && GrandExchangeOfferAgeComparator.SequenceDefinition_get(super.sequence).field3515 == 1) { + final void method2045(int var1, int var2, boolean var3) { + if (super.sequence != -1 && WorldMapSection0.SequenceDefinition_get(super.sequence).field3493 == 1) { super.sequence = -1; } @@ -123,26 +117,26 @@ public final class NPC extends Actor { } super.pathLength = 0; - super.field994 = 0; - super.field976 = 0; + super.field926 = 0; + super.field980 = 0; super.pathX[0] = var1; super.pathY[0] = var2; - super.x = super.field938 * 64 + super.pathX[0] * 128; - super.y = super.field938 * 64 + super.pathY[0] * 128; + super.x = super.field925 * 64 + super.pathX[0] * 128; + super.y = super.field925 * 64 + super.pathY[0] * 128; } - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)Ldf;", - garbageValue = "-174129419" + signature = "(I)Ldw;", + garbageValue = "822221372" ) @Export("getModel") protected final Model getModel() { if (this.definition == null) { return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? GrandExchangeOfferAgeComparator.SequenceDefinition_get(super.sequence) : null; - SequenceDefinition var2 = super.movementSequence != -1 && (super.readySequence != super.movementSequence || var1 == null) ? GrandExchangeOfferAgeComparator.SequenceDefinition_get(super.movementSequence) : null; + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? WorldMapSection0.SequenceDefinition_get(super.sequence) : null; + SequenceDefinition var2 = super.movementSequence != -1 && (super.readySequence != super.movementSequence || var1 == null) ? WorldMapSection0.SequenceDefinition_get(super.movementSequence) : null; Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame); if (var3 == null) { return null; @@ -150,9 +144,9 @@ public final class NPC extends Actor { var3.calculateBoundsCylinder(); super.defaultHeight = var3.height; if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) { - Model var4 = WorldMapRegion.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); + Model var4 = ClientPacket.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); if (var4 != null) { - var4.offsetBy(0, -super.field996, 0); + var4.offsetBy(0, -super.field963, 0); Model[] var5 = new Model[]{var3, var4}; var3 = new Model(var5, 2); } @@ -167,13 +161,23 @@ public final class NPC extends Actor { } } - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-968027489" + signature = "(S)Z", + garbageValue = "3163" ) @Export("isVisible") final boolean isVisible() { return this.definition != null; } + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(IB)Ljava/lang/String;", + garbageValue = "66" + ) + @Export("colorStartTag") + static String colorStartTag(int var0) { + return ""; + } } diff --git a/runescape-client/src/main/java/NPCDefinition.java b/runescape-client/src/main/java/NPCDefinition.java index 997fcfc524..257779c1b7 100644 --- a/runescape-client/src/main/java/NPCDefinition.java +++ b/runescape-client/src/main/java/NPCDefinition.java @@ -4,185 +4,185 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ih") +@ObfuscatedName("iw") @Implements("NPCDefinition") public class NPCDefinition extends DualNode { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lhf;" + signature = "Lhz;" ) @Export("NpcDefinition_archive") public static AbstractArchive NpcDefinition_archive; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lhf;" + signature = "Lhz;" ) @Export("NpcDefinition_modelArchive") public static AbstractArchive NpcDefinition_modelArchive; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lef;" + signature = "Leb;" ) @Export("NpcDefinition_cached") static EvictingDualNodeHashTable NpcDefinition_cached; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lef;" + signature = "Leb;" ) @Export("NpcDefinition_cachedModels") static EvictingDualNodeHashTable NpcDefinition_cachedModels; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 164501927 + intValue = -1437394053 ) @Export("id") public int id; - @ObfuscatedName("p") + @ObfuscatedName("b") @Export("name") public String name; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -462322575 + intValue = 1272907781 ) @Export("size") public int size; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("models") int[] models; - @ObfuscatedName("w") - int[] field3473; - @ObfuscatedName("i") + @ObfuscatedName("a") + int[] field3436; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 176836605 + intValue = -643490475 ) @Export("readySequence") public int readySequence; - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1998294477 + intValue = -1453036441 ) @Export("turnLeftSequence") public int turnLeftSequence; - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 814959013 + intValue = -1313837071 ) @Export("turnRightSequence") public int turnRightSequence; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1138584261 + intValue = -2006817371 ) @Export("walkSequence") public int walkSequence; - @ObfuscatedName("e") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -700991039 + intValue = 868075509 ) @Export("walkBackSequence") public int walkBackSequence; - @ObfuscatedName("n") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1373986667 + intValue = -1582057393 ) @Export("walkLeftSequence") public int walkLeftSequence; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 196461725 + intValue = 1584002895 ) @Export("walkRightSequence") public int walkRightSequence; - @ObfuscatedName("c") + @ObfuscatedName("t") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("d") + @ObfuscatedName("n") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("s") + @ObfuscatedName("u") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("t") + @ObfuscatedName("z") @Export("actions") public String[] actions; - @ObfuscatedName("m") + @ObfuscatedName("h") @Export("drawMapDot") public boolean drawMapDot; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 578089375 + intValue = -1760974573 ) @Export("combatLevel") public int combatLevel; - @ObfuscatedName("q") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -237386169 + intValue = -674853701 ) @Export("widthScale") int widthScale; - @ObfuscatedName("l") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 610202011 + intValue = 2021062483 ) @Export("heightScale") int heightScale; - @ObfuscatedName("j") + @ObfuscatedName("q") @Export("isVisible") public boolean isVisible; - @ObfuscatedName("af") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = 660350725 + intValue = -2035323497 ) @Export("ambient") int ambient; - @ObfuscatedName("ad") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 1399735857 + intValue = 577893051 ) @Export("contrast") int contrast; - @ObfuscatedName("am") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = -1851898055 + intValue = 1527639479 ) @Export("headIconPrayer") public int headIconPrayer; - @ObfuscatedName("ai") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 361763773 + intValue = 1588998257 ) @Export("rotation") public int rotation; - @ObfuscatedName("ag") + @ObfuscatedName("ak") @Export("transforms") public int[] transforms; - @ObfuscatedName("ao") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = 1802442643 + intValue = -1212272583 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("aw") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = 1667734657 + intValue = 529914747 ) @Export("transformVarp") int transformVarp; - @ObfuscatedName("ak") + @ObfuscatedName("aq") @Export("isInteractable") public boolean isInteractable; - @ObfuscatedName("aa") + @ObfuscatedName("ao") @Export("isClickable") public boolean isClickable; - @ObfuscatedName("ab") + @ObfuscatedName("an") @Export("isFollower") public boolean isFollower; @ObfuscatedName("ar") @ObfuscatedSignature( - signature = "Llb;" + signature = "Llc;" ) @Export("params") IterableNodeHashTable params; @@ -219,19 +219,19 @@ public class NPCDefinition extends DualNode { this.isFollower = false; } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1815650362" + garbageValue = "-1780745030" ) @Export("postDecode") void postDecode() { } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Lkg;I)V", - garbageValue = "-724164994" + signature = "(Lkq;I)V", + garbageValue = "643365222" ) @Export("decode") void decode(Buffer var1) { @@ -245,10 +245,10 @@ public class NPCDefinition extends DualNode { } } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lkg;II)V", - garbageValue = "636611329" + signature = "(Lkq;II)V", + garbageValue = "731646474" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -303,10 +303,10 @@ public class NPCDefinition extends DualNode { } } else if (var2 == 60) { var3 = var1.readUnsignedByte(); - this.field3473 = new int[var3]; + this.field3436 = new int[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.field3473[var4] = var1.readUnsignedShort(); + this.field3436[var4] = var1.readUnsignedShort(); } } else if (var2 == 93) { this.drawMapDot = false; @@ -334,7 +334,7 @@ public class NPCDefinition extends DualNode { } else if (var2 == 111) { this.isFollower = true; } else if (var2 == 249) { - this.params = ModelData0.readStringIntParameters(var1, this.params); + this.params = Calendar.readStringIntParameters(var1, this.params); } } else { this.transformVarbit = var1.readUnsignedShort(); @@ -370,10 +370,10 @@ public class NPCDefinition extends DualNode { } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Liy;ILiy;II)Ldf;", - garbageValue = "226641417" + signature = "(Liv;ILiv;IB)Ldw;", + garbageValue = "3" ) @Export("getModel") public final Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { @@ -444,23 +444,23 @@ public class NPCDefinition extends DualNode { } } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(B)Ldq;", - garbageValue = "126" + signature = "(B)Ldd;", + garbageValue = "-58" ) @Export("getModelData") public final ModelData getModelData() { if (this.transforms != null) { NPCDefinition var1 = this.transform(); return var1 == null ? null : var1.getModelData(); - } else if (this.field3473 == null) { + } else if (this.field3436 == null) { return null; } else { boolean var5 = false; - for (int var2 = 0; var2 < this.field3473.length; ++var2) { - if (!NpcDefinition_modelArchive.tryLoadFile(this.field3473[var2], 0)) { + for (int var2 = 0; var2 < this.field3436.length; ++var2) { + if (!NpcDefinition_modelArchive.tryLoadFile(this.field3436[var2], 0)) { var5 = true; } } @@ -468,10 +468,10 @@ public class NPCDefinition extends DualNode { if (var5) { return null; } else { - ModelData[] var6 = new ModelData[this.field3473.length]; + ModelData[] var6 = new ModelData[this.field3436.length]; - for (int var3 = 0; var3 < this.field3473.length; ++var3) { - var6[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field3473[var3], 0); + for (int var3 = 0; var3 < this.field3436.length; ++var3) { + var6[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field3436[var3], 0); } ModelData var7; @@ -499,16 +499,16 @@ public class NPCDefinition extends DualNode { } } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(I)Lih;", - garbageValue = "986756631" + signature = "(B)Liw;", + garbageValue = "47" ) @Export("transform") public final NPCDefinition transform() { int var1 = -1; if (this.transformVarbit != -1) { - var1 = FileSystem.getVarbit(this.transformVarbit); + var1 = GameShell.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -520,13 +520,13 @@ public class NPCDefinition extends DualNode { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? VarcInt.getNpcDefinition(var2) : null; + return var2 != -1 ? AbstractUserComparator.getNpcDefinition(var2) : null; } - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1773162778" + garbageValue = "-251479822" ) @Export("transformIsVisible") public boolean transformIsVisible() { @@ -535,7 +535,7 @@ public class NPCDefinition extends DualNode { } else { int var1 = -1; if (this.transformVarbit != -1) { - var1 = FileSystem.getVarbit(this.transformVarbit); + var1 = GameShell.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -548,36 +548,23 @@ public class NPCDefinition extends DualNode { } } - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( signature = "(III)I", - garbageValue = "1256288867" + garbageValue = "-1643903914" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - IterableNodeHashTable var4 = this.params; - int var3; - if (var4 == null) { - var3 = var2; - } else { - IntegerNode var5 = (IntegerNode)var4.get((long)var1); - if (var5 == null) { - var3 = var2; - } else { - var3 = var5.integer; - } - } - - return var3; + return class83.method2071(this.params, var1, var2); } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "-933407818" + garbageValue = "1559227627" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return ServerBuild.method4214(this.params, var1, var2); + return class14.method151(this.params, var1, var2); } } diff --git a/runescape-client/src/main/java/NanoClock.java b/runescape-client/src/main/java/NanoClock.java index 950a43d368..3b9abee3dc 100644 --- a/runescape-client/src/main/java/NanoClock.java +++ b/runescape-client/src/main/java/NanoClock.java @@ -4,77 +4,55 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fz") +@ObfuscatedName("fn") @Implements("NanoClock") public class NanoClock extends Clock { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedGetter( - longValue = 1210621623438616379L + longValue = -5525829969784461379L ) @Export("lastTimeNano") long lastTimeNano; - public NanoClock() { + NanoClock() { this.lastTimeNano = System.nanoTime(); } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-26166053" + signature = "(B)V", + garbageValue = "4" ) @Export("mark") public void mark() { this.lastTimeNano = System.nanoTime(); } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "6" + signature = "(III)I", + garbageValue = "670539248" ) @Export("wait") public int wait(int var1, int var2) { - long var3 = (long)var2 * 1000000L; + long var3 = 1000000L * (long)var2; long var5 = this.lastTimeNano - System.nanoTime(); if (var5 < var3) { var5 = var3; } - long var7 = var5 / 1000000L; - long var9; - if (var7 > 0L) { - if (var7 % 10L == 0L) { - var9 = var7 - 1L; + ServerBuild.method4111(var5 / 1000000L); + long var7 = System.nanoTime(); - try { - Thread.sleep(var9); - } catch (InterruptedException var16) { - } - - try { - Thread.sleep(1L); - } catch (InterruptedException var15) { - } - } else { - try { - Thread.sleep(var7); - } catch (InterruptedException var14) { - } - } + int var9; + for (var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += (long)var1 * 1000000L) { + ++var9; } - var9 = System.nanoTime(); - - int var13; - for (var13 = 0; var13 < 10 && (var13 < 1 || this.lastTimeNano < var9); this.lastTimeNano += 1000000L * (long)var1) { - ++var13; + if (this.lastTimeNano < var7) { + this.lastTimeNano = var7; } - if (this.lastTimeNano < var9) { - this.lastTimeNano = var9; - } - - return var13; + return var9; } } diff --git a/runescape-client/src/main/java/NetCache.java b/runescape-client/src/main/java/NetCache.java index efd376035b..e97d852ece 100644 --- a/runescape-client/src/main/java/NetCache.java +++ b/runescape-client/src/main/java/NetCache.java @@ -1,4 +1,3 @@ -import java.security.SecureRandom; import java.util.zip.CRC32; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; @@ -6,119 +5,117 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("im") +@ObfuscatedName("ie") @Implements("NetCache") public class NetCache { - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lkn;" - ) - @Export("NetCache_socket") - public static AbstractSocket NetCache_socket; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 264322769 + intValue = 1630504157 ) @Export("NetCache_loadTime") - static int NetCache_loadTime; - @ObfuscatedName("b") + public static int NetCache_loadTime; + @ObfuscatedName("y") @ObfuscatedGetter( - longValue = 5787144864761896795L + longValue = 7111206406061673093L ) - static long field3171; - @ObfuscatedName("g") + public static long field3138; + @ObfuscatedName("w") @ObfuscatedSignature( signature = "Lle;" ) @Export("NetCache_pendingPriorityWrites") - static NodeHashTable NetCache_pendingPriorityWrites; - @ObfuscatedName("z") + public static NodeHashTable NetCache_pendingPriorityWrites; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -889206253 + intValue = -1216011111 ) @Export("NetCache_pendingPriorityWritesCount") - static int NetCache_pendingPriorityWritesCount; - @ObfuscatedName("p") + public static int NetCache_pendingPriorityWritesCount; + @ObfuscatedName("b") @ObfuscatedSignature( signature = "Lle;" ) @Export("NetCache_pendingPriorityResponses") - static NodeHashTable NetCache_pendingPriorityResponses; - @ObfuscatedName("h") + public static NodeHashTable NetCache_pendingPriorityResponses; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -837346681 + intValue = -1365764657 ) @Export("NetCache_pendingPriorityResponsesCount") - static int NetCache_pendingPriorityResponsesCount; - @ObfuscatedName("y") + public static int NetCache_pendingPriorityResponsesCount; + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Liw;" + signature = "Lin;" ) @Export("NetCache_pendingWritesQueue") - static DualNodeDeque NetCache_pendingWritesQueue; - @ObfuscatedName("w") + public static DualNodeDeque NetCache_pendingWritesQueue; + @ObfuscatedName("a") @ObfuscatedSignature( signature = "Lle;" ) @Export("NetCache_pendingWrites") static NodeHashTable NetCache_pendingWrites; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1003289655 + intValue = -2110572147 ) @Export("NetCache_pendingWritesCount") - static int NetCache_pendingWritesCount; - @ObfuscatedName("k") + public static int NetCache_pendingWritesCount; + @ObfuscatedName("c") @ObfuscatedSignature( signature = "Lle;" ) @Export("NetCache_pendingResponses") - static NodeHashTable NetCache_pendingResponses; - @ObfuscatedName("x") + public static NodeHashTable NetCache_pendingResponses; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -798851663 + intValue = 756706735 ) @Export("NetCache_pendingResponsesCount") - static int NetCache_pendingResponsesCount; - @ObfuscatedName("o") - static boolean field3181; - @ObfuscatedName("e") + public static int NetCache_pendingResponsesCount; + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lhi;" - ) - @Export("NetCache_currentResponse") - static NetFileRequest NetCache_currentResponse; - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "Lkg;" + signature = "Lkq;" ) @Export("NetCache_responseHeaderBuffer") - static Buffer NetCache_responseHeaderBuffer; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -1164709819 - ) - static int field3188; - @ObfuscatedName("d") - @Export("NetCache_crc") - static CRC32 NetCache_crc; - @ObfuscatedName("t") + public static Buffer NetCache_responseHeaderBuffer; + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "[Lij;" + signature = "Lkq;" + ) + @Export("NetCache_responseArchiveBuffer") + public static Buffer NetCache_responseArchiveBuffer; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -910401727 + ) + public static int field3150; + @ObfuscatedName("n") + @Export("NetCache_crc") + public static CRC32 NetCache_crc; + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "Lkq;" + ) + @Export("NetCache_reference") + public static Buffer NetCache_reference; + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "[Lif;" ) @Export("NetCache_archives") - static Archive[] NetCache_archives; + public static Archive[] NetCache_archives; + @ObfuscatedName("h") + public static byte field3145; @ObfuscatedName("m") - static byte field3184; - @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1730449229 + intValue = 483863755 ) @Export("NetCache_crcMismatches") public static int NetCache_crcMismatches; - @ObfuscatedName("q") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1846767251 + intValue = 1880063005 ) @Export("NetCache_ioExceptions") public static int NetCache_ioExceptions; @@ -135,176 +132,11 @@ public class NetCache { NetCache_pendingResponses = new NodeHashTable(4096); NetCache_pendingResponsesCount = 0; NetCache_responseHeaderBuffer = new Buffer(8); - field3188 = 0; + field3150 = 0; NetCache_crc = new CRC32(); NetCache_archives = new Archive[256]; - field3184 = 0; + field3145 = 0; NetCache_crcMismatches = 0; NetCache_ioExceptions = 0; } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(I)Ljava/security/SecureRandom;", - garbageValue = "967007361" - ) - static SecureRandom method4394() { - SecureRandom var0 = new SecureRandom(); - var0.nextInt(); - return var0; - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(II)Lib;", - garbageValue = "1375057388" - ) - @Export("VarpDefinition_get") - public static VarpDefinition VarpDefinition_get(int var0) { - VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); - var1 = new VarpDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "(ILci;ZI)I", - garbageValue = "1873047599" - ) - static int method4397(int var0, Script var1, boolean var2) { - if (var0 < 1000) { - return ServerPacket.method3657(var0, var1, var2); - } else if (var0 < 1100) { - return GameShell.method952(var0, var1, var2); - } else if (var0 < 1200) { - return SecureRandomCallable.method1171(var0, var1, var2); - } else if (var0 < 1300) { - return Interpreter.method1995(var0, var1, var2); - } else if (var0 < 1400) { - return class189.method3698(var0, var1, var2); - } else if (var0 < 1500) { - return Varcs.method2201(var0, var1, var2); - } else if (var0 < 1600) { - return Canvas.method873(var0, var1, var2); - } else if (var0 < 1700) { - return Varcs.method2220(var0, var1, var2); - } else if (var0 < 1800) { - return Decimator.method2564(var0, var1, var2); - } else if (var0 < 1900) { - return Messages.method2241(var0, var1, var2); - } else if (var0 < 2000) { - return Actor.method1774(var0, var1, var2); - } else if (var0 < 2100) { - return GameShell.method952(var0, var1, var2); - } else if (var0 < 2200) { - return SecureRandomCallable.method1171(var0, var1, var2); - } else if (var0 < 2300) { - return Interpreter.method1995(var0, var1, var2); - } else if (var0 < 2400) { - return class189.method3698(var0, var1, var2); - } else if (var0 < 2500) { - return Varcs.method2201(var0, var1, var2); - } else if (var0 < 2600) { - return Language.method3710(var0, var1, var2); - } else if (var0 < 2700) { - return AbstractWorldMapIcon.method618(var0, var1, var2); - } else if (var0 < 2800) { - return class267.method5067(var0, var1, var2); - } else if (var0 < 2900) { - return WorldMapDecoration.method355(var0, var1, var2); - } else if (var0 < 3000) { - return Actor.method1774(var0, var1, var2); - } else if (var0 < 3200) { - return Timer.method5098(var0, var1, var2); - } else if (var0 < 3300) { - return Skeleton.method3107(var0, var1, var2); - } else if (var0 < 3400) { - return WorldMapSection1.method608(var0, var1, var2); - } else if (var0 < 3500) { - return class83.method2091(var0, var1, var2); - } else if (var0 < 3700) { - return class16.method195(var0, var1, var2); - } else if (var0 < 4000) { - return SoundSystem.method2530(var0, var1, var2); - } else if (var0 < 4100) { - return BoundaryObject.method3313(var0, var1, var2); - } else if (var0 < 4200) { - return WorldMapArea.method396(var0, var1, var2); - } else if (var0 < 4300) { - return class4.method66(var0, var1, var2); - } else if (var0 < 5100) { - return MusicPatchNode2.method3747(var0, var1, var2); - } else if (var0 < 5400) { - return WorldMapData_0.method193(var0, var1, var2); - } else if (var0 < 5600) { - return class16.method196(var0, var1, var2); - } else if (var0 < 5700) { - return Varcs.method2194(var0, var1, var2); - } else if (var0 < 6300) { - return class16.method197(var0, var1, var2); - } else if (var0 < 6600) { - return ModelData0.method3299(var0, var1, var2); - } else { - return var0 < 6700 ? GrandExchangeOfferWorldComparator.method78(var0, var1, var2) : 2; - } - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-2033375403" - ) - public static void method4399() { - 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("g") - @ObfuscatedSignature( - signature = "([BIIB)Ljava/lang/String;", - garbageValue = "-77" - ) - @Export("decodeStringCp1252") - public static String decodeStringCp1252(byte[] var0, int var1, int var2) { - char[] var3 = new char[var2]; - int var4 = 0; - - for (int var5 = 0; var5 < var2; ++var5) { - int var6 = var0[var5 + var1] & 255; - if (var6 != 0) { - if (var6 >= 128 && var6 < 160) { - char var7 = class287.cp1252AsciiExtension[var6 - 128]; - if (var7 == 0) { - var7 = '?'; - } - - var6 = var7; - } - - var3[var4++] = (char)var6; - } - } - - return new String(var3, 0, var4); - } } diff --git a/runescape-client/src/main/java/NetFileRequest.java b/runescape-client/src/main/java/NetFileRequest.java index 7e8ea0d32d..6485d12d5f 100644 --- a/runescape-client/src/main/java/NetFileRequest.java +++ b/runescape-client/src/main/java/NetFileRequest.java @@ -4,34 +4,56 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hi") +@ObfuscatedName("ho") @Implements("NetFileRequest") public class NetFileRequest extends DualNode { - @ObfuscatedName("u") + @ObfuscatedName("cv") + @Export("mouseCam") + static boolean mouseCam; + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lij;" + signature = "Lif;" ) @Export("archive") - Archive archive; - @ObfuscatedName("f") + public Archive archive; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1722853761 + intValue = -1793018397 ) @Export("crc") - int crc; - @ObfuscatedName("b") + public int crc; + @ObfuscatedName("y") @Export("padding") - byte padding; + public byte padding; NetFileRequest() { } - @ObfuscatedName("u") + @ObfuscatedName("kz") @ObfuscatedSignature( - signature = "(Lhf;I)V", - garbageValue = "-568024441" + signature = "(Ljava/lang/String;ZI)Ljava/lang/String;", + garbageValue = "1995619175" ) - public static void method4230(AbstractArchive var0) { - StructDefinition.StructDefinition_archive = var0; + static String method4121(String var0, boolean var1) { + String var2 = var1 ? "https://" : "http://"; + if (Client.gameBuild == 1) { + var0 = var0 + "-wtrc"; + } else if (Client.gameBuild == 2) { + var0 = var0 + "-wtqa"; + } else if (Client.gameBuild == 3) { + var0 = var0 + "-wtwip"; + } else if (Client.gameBuild == 5) { + var0 = var0 + "-wti"; + } else if (Client.gameBuild == 4) { + var0 = "local"; + } + + String var3 = ""; + if (UserComparator10.field1943 != null) { + var3 = "/p=" + UserComparator10.field1943; + } + + String var4 = "runescape.com"; + return var2 + var0 + "." + var4 + "/l=" + Varps.clientLanguage + "/a=" + MouseRecorder.field564 + var3 + "/"; } } diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java index a90637febd..ec40168a07 100644 --- a/runescape-client/src/main/java/NetSocket.java +++ b/runescape-client/src/main/java/NetSocket.java @@ -9,66 +9,75 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fq") +@ObfuscatedName("fa") @Implements("NetSocket") public final class NetSocket extends AbstractSocket implements Runnable { - @ObfuscatedName("u") + @ObfuscatedName("qg") + @ObfuscatedSignature( + signature = "Lcw;" + ) + @Export("pcmPlayer1") + static PcmPlayer pcmPlayer1; + @ObfuscatedName("as") + @Export("fontHelvetica13") + static java.awt.Font fontHelvetica13; + @ObfuscatedName("f") @Export("inputStream") InputStream inputStream; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("outputStream") OutputStream outputStream; - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("socket") Socket socket; - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("isClosed") boolean isClosed; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lfu;" + signature = "Lfl;" ) @Export("taskHandler") TaskHandler taskHandler; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "Lfo;" + signature = "Lfu;" ) @Export("task") Task task; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("outBuffer") byte[] outBuffer; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -802191953 + intValue = 1287462685 ) @Export("outLength") int outLength; - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -2034803765 + intValue = -533628629 ) @Export("outOffset") int outOffset; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("exceptionWriting") boolean exceptionWriting; - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1614956345 + intValue = 1191664447 ) @Export("bufferLength") final int bufferLength; - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 881888213 + intValue = 693906147 ) @Export("maxPacketLength") final int maxPacketLength; @ObfuscatedSignature( - signature = "(Ljava/net/Socket;Lfu;I)V" + signature = "(Ljava/net/Socket;Lfl;I)V" ) public NetSocket(Socket var1, TaskHandler var2, int var3) throws IOException { this.isClosed = false; @@ -87,10 +96,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { this.outputStream = this.socket.getOutputStream(); } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-29" + signature = "(I)V", + garbageValue = "-647274291" ) @Export("close") public void close() { @@ -102,10 +111,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { if (this.task != null) { while (this.task.status == 0) { - try { - Thread.sleep(1L); - } catch (InterruptedException var4) { - } + ServerBuild.method4111(1L); } if (this.task.status == 1) { @@ -120,30 +126,30 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "27" + signature = "(I)I", + garbageValue = "2115277231" ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { return this.isClosed ? 0 : this.inputStream.read(); } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-53" + signature = "(I)I", + garbageValue = "-972484659" ) @Export("available") public int available() throws IOException { return this.isClosed ? 0 : this.inputStream.available(); } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "-1591428004" + garbageValue = "497635177" ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { @@ -154,10 +160,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "([BIIB)I", - garbageValue = "29" + signature = "([BIII)I", + garbageValue = "-1642271193" ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { @@ -179,10 +185,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( signature = "([BIIB)V", - garbageValue = "118" + garbageValue = "59" ) @Export("write0") void write0(byte[] var1, int var2, int var3) throws IOException { @@ -214,10 +220,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "([BIII)V", - garbageValue = "-543253817" + garbageValue = "-340382115" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { @@ -267,7 +273,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { this.outLength = (var1 + this.outLength) % this.bufferLength; try { - if (this.outOffset == this.outLength) { + if (this.outLength == this.outOffset) { this.outputStream.flush(); } } catch (IOException var8) { @@ -295,8 +301,88 @@ public final class NetSocket extends AbstractSocket implements Runnable { break; } } catch (Exception var12) { - Calendar.RunException_sendStackTrace((String)null, var12); + DesktopPlatformInfoProvider.RunException_sendStackTrace((String)null, var12); } } + + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "(CB)B", + garbageValue = "11" + ) + @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; + } + + @ObfuscatedName("av") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1769273024" + ) + public static void method3525() { + ItemDefinition.ItemDefinition_cachedSprites.clear(); + } } diff --git a/runescape-client/src/main/java/Node.java b/runescape-client/src/main/java/Node.java index 9af8f1d659..ecc0fd99f8 100644 --- a/runescape-client/src/main/java/Node.java +++ b/runescape-client/src/main/java/Node.java @@ -3,26 +3,26 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fb") +@ObfuscatedName("gk") @Implements("Node") public class Node { - @ObfuscatedName("cc") + @ObfuscatedName("cr") @Export("key") public long key; - @ObfuscatedName("cp") + @ObfuscatedName("cy") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Lgk;" ) @Export("previous") public Node previous; - @ObfuscatedName("ce") + @ObfuscatedName("cz") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Lgk;" ) @Export("next") public Node next; - @ObfuscatedName("fs") + @ObfuscatedName("fu") @Export("remove") public void remove() { if (this.next != null) { @@ -33,7 +33,7 @@ public class Node { } } - @ObfuscatedName("fk") + @ObfuscatedName("fl") @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 b528e29d70..d71a78dcbe 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("jd") +@ObfuscatedName("js") @Implements("NodeDeque") public class NodeDeque { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Lgk;" ) @Export("sentinel") public Node sentinel; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Lgk;" ) @Export("current") Node current; @@ -25,7 +25,7 @@ public class NodeDeque { this.sentinel.next = this.sentinel; } - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("clear") public void clear() { while (true) { @@ -39,9 +39,9 @@ public class NodeDeque { } } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lfb;)V" + signature = "(Lgk;)V" ) @Export("addFirst") public void addFirst(Node var1) { @@ -55,9 +55,9 @@ public class NodeDeque { var1.previous.next = var1; } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Lfb;)V" + signature = "(Lgk;)V" ) @Export("addLast") public void addLast(Node var1) { @@ -71,9 +71,9 @@ public class NodeDeque { var1.previous.next = var1; } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "()Lfb;" + signature = "()Lgk;" ) @Export("removeLast") public Node removeLast() { @@ -86,9 +86,9 @@ public class NodeDeque { } } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "()Lfb;" + signature = "()Lgk;" ) @Export("removeFirst") public Node removeFirst() { @@ -101,9 +101,9 @@ public class NodeDeque { } } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "()Lfb;" + signature = "()Lgk;" ) @Export("last") public Node last() { @@ -117,9 +117,9 @@ public class NodeDeque { } } - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "()Lfb;" + signature = "()Lgk;" ) @Export("first") public Node first() { @@ -133,9 +133,9 @@ public class NodeDeque { } } - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "()Lfb;" + signature = "()Lgk;" ) @Export("previous") public Node previous() { @@ -149,9 +149,9 @@ public class NodeDeque { } } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "()Lfb;" + signature = "()Lgk;" ) @Export("next") public Node next() { @@ -165,9 +165,9 @@ public class NodeDeque { } } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lfb;Lfb;)V" + signature = "(Lgk;Lgk;)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 4957bce8fe..32eb84bd36 100644 --- a/runescape-client/src/main/java/NodeHashTable.java +++ b/runescape-client/src/main/java/NodeHashTable.java @@ -6,28 +6,28 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("le") @Implements("NodeHashTable") public final class NodeHashTable { - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("size") int size; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "[Lfb;" + signature = "[Lgk;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Lgk;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Lgk;" ) @Export("current") Node current; - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("index") int index; @@ -44,9 +44,9 @@ public final class NodeHashTable { } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(J)Lfb;" + signature = "(J)Lgk;" ) @Export("get") public Node get(long var1) { @@ -64,9 +64,9 @@ public final class NodeHashTable { return null; } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lfb;J)V" + signature = "(Lgk;J)V" ) @Export("put") public void put(Node var1, long var2) { @@ -82,9 +82,9 @@ public final class NodeHashTable { var1.key = var2; } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "()Lfb;" + signature = "()Lgk;" ) @Export("first") public Node first() { @@ -92,9 +92,9 @@ public final class NodeHashTable { return this.next(); } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "()Lfb;" + signature = "()Lgk;" ) @Export("next") public Node next() { diff --git a/runescape-client/src/main/java/ObjectDefinition.java b/runescape-client/src/main/java/ObjectDefinition.java index a8ae11fcda..843e6b2c25 100644 --- a/runescape-client/src/main/java/ObjectDefinition.java +++ b/runescape-client/src/main/java/ObjectDefinition.java @@ -1,266 +1,266 @@ -import java.awt.Toolkit; -import java.awt.datatransfer.Clipboard; -import java.awt.datatransfer.DataFlavor; -import java.awt.datatransfer.Transferable; -import java.awt.datatransfer.UnsupportedFlavorException; -import java.io.IOException; import 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("il") +@ObfuscatedName("ig") @Implements("ObjectDefinition") public class ObjectDefinition extends DualNode { - @ObfuscatedName("u") - @Export("ObjectDefinition_isLowDetail") - static boolean ObjectDefinition_isLowDetail; @ObfuscatedName("f") + @Export("ObjectDefinition_isLowDetail") + public static boolean ObjectDefinition_isLowDetail; + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lhf;" + signature = "Lhz;" ) @Export("ObjectDefinition_archive") - static AbstractArchive ObjectDefinition_archive; - @ObfuscatedName("b") + public static AbstractArchive ObjectDefinition_archive; + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lhf;" + signature = "Lhz;" ) @Export("ObjectDefinition_modelsArchive") - static AbstractArchive ObjectDefinition_modelsArchive; - @ObfuscatedName("g") + public static AbstractArchive ObjectDefinition_modelsArchive; + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lef;" + signature = "Leb;" ) @Export("ObjectDefinition_cached") static EvictingDualNodeHashTable ObjectDefinition_cached; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lef;" + signature = "Leb;" ) @Export("ObjectDefinition_cachedModelData") public static EvictingDualNodeHashTable ObjectDefinition_cachedModelData; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "Lef;" + signature = "Leb;" ) @Export("ObjectDefinition_cachedEntities") static EvictingDualNodeHashTable ObjectDefinition_cachedEntities; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lef;" + signature = "Leb;" ) @Export("ObjectDefinition_cachedModels") static EvictingDualNodeHashTable ObjectDefinition_cachedModels; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "[Ldq;" + signature = "[Ldd;" ) - static ModelData[] field3359; - @ObfuscatedName("w") + static ModelData[] field3316; + @ObfuscatedName("gc") + @ObfuscatedSignature( + signature = "[Lls;" + ) + @Export("crossSprites") + static Sprite[] crossSprites; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1224047329 + intValue = 380155021 ) @Export("id") public int id; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("modelIds") int[] modelIds; - @ObfuscatedName("k") + @ObfuscatedName("c") @Export("models") int[] models; - @ObfuscatedName("x") + @ObfuscatedName("o") @Export("name") public String name; - @ObfuscatedName("o") + @ObfuscatedName("v") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("e") + @ObfuscatedName("k") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("n") + @ObfuscatedName("s") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("c") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1491775379 + intValue = -682227109 ) @Export("sizeX") public int sizeX; - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1523535533 + intValue = 598448161 ) @Export("sizeY") public int sizeY; - @ObfuscatedName("d") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -497299079 + intValue = -19779137 ) @Export("interactType") public int interactType; - @ObfuscatedName("s") + @ObfuscatedName("u") @Export("boolean1") public boolean boolean1; - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -902316801 + intValue = 532107779 ) @Export("int1") public int int1; - @ObfuscatedName("m") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1874021809 + intValue = 893657291 ) @Export("clipType") int clipType; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("nonFlatShading") boolean nonFlatShading; - @ObfuscatedName("q") + @ObfuscatedName("g") @Export("modelClipped") public boolean modelClipped; - @ObfuscatedName("l") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 560318425 + intValue = 1184328289 ) @Export("animationId") public int animationId; - @ObfuscatedName("j") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1161238399 + intValue = 34352155 ) @Export("int2") public int int2; - @ObfuscatedName("af") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -1664759947 + intValue = -1957249099 ) @Export("ambient") int ambient; - @ObfuscatedName("ad") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -740378647 + intValue = 2137656901 ) @Export("contrast") int contrast; - @ObfuscatedName("am") + @ObfuscatedName("aw") @Export("actions") public String[] actions; - @ObfuscatedName("ai") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -1328345039 + intValue = 139097985 ) @Export("mapIconId") public int mapIconId; - @ObfuscatedName("ag") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 114604009 + intValue = -1108089965 ) @Export("mapSceneId") public int mapSceneId; - @ObfuscatedName("ao") + @ObfuscatedName("au") @Export("isRotated") boolean isRotated; - @ObfuscatedName("aw") + @ObfuscatedName("ah") @Export("clipped") public boolean clipped; - @ObfuscatedName("ak") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = 1275317383 + intValue = -1422335407 ) @Export("modelSizeX") int modelSizeX; - @ObfuscatedName("aa") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 561892729 + intValue = -4639683 ) @Export("modelHeight") int modelHeight; - @ObfuscatedName("ab") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -830571783 + intValue = -782763969 ) @Export("modelSizeY") int modelSizeY; @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 1415912703 + intValue = -1759322099 ) @Export("offsetX") int offsetX; - @ObfuscatedName("av") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 1898203577 + intValue = 548923493 ) @Export("offsetHeight") int offsetHeight; - @ObfuscatedName("aq") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = -1849368413 + intValue = 1567534237 ) @Export("offsetY") int offsetY; - @ObfuscatedName("ac") + @ObfuscatedName("ag") @Export("boolean2") public boolean boolean2; - @ObfuscatedName("az") + @ObfuscatedName("ac") @Export("isSolid") boolean isSolid; - @ObfuscatedName("at") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -1008945237 + intValue = -879946961 ) @Export("int3") public int int3; @ObfuscatedName("ae") @Export("transforms") public int[] transforms; - @ObfuscatedName("aj") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -1651874633 + intValue = -1292334105 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("ap") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -1197064613 + intValue = 1597795119 ) @Export("transformVarp") int transformVarp; - @ObfuscatedName("an") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 635324039 + intValue = 1540397 ) @Export("ambientSoundId") public int ambientSoundId; - @ObfuscatedName("al") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -133480475 + intValue = -632541059 ) @Export("int4") public int int4; - @ObfuscatedName("ay") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 1751772739 + intValue = 2107243609 ) @Export("int5") public int int5; - @ObfuscatedName("ax") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -2030067949 + intValue = -2056982537 ) @Export("int6") public int int6; - @ObfuscatedName("au") + @ObfuscatedName("ai") @Export("soundEffectIds") public int[] soundEffectIds; - @ObfuscatedName("as") + @ObfuscatedName("am") @ObfuscatedSignature( - signature = "Llb;" + signature = "Llc;" ) @Export("params") IterableNodeHashTable params; @@ -271,7 +271,7 @@ public class ObjectDefinition extends DualNode { ObjectDefinition_cachedModelData = new EvictingDualNodeHashTable(500); ObjectDefinition_cachedEntities = new EvictingDualNodeHashTable(30); ObjectDefinition_cachedModels = new EvictingDualNodeHashTable(30); - field3359 = new ModelData[4]; + field3316 = new ModelData[4]; } ObjectDefinition() { @@ -310,10 +310,10 @@ public class ObjectDefinition extends DualNode { this.int6 = 0; } - @ObfuscatedName("b") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "-21114" + signature = "(B)V", + garbageValue = "17" ) @Export("postDecode") void postDecode() { @@ -336,10 +336,10 @@ public class ObjectDefinition extends DualNode { } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Lkg;I)V", - garbageValue = "-1870971162" + signature = "(Lkq;B)V", + garbageValue = "-87" ) @Export("decode") void decode(Buffer var1) { @@ -353,10 +353,10 @@ public class ObjectDefinition extends DualNode { } } - @ObfuscatedName("z") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lkg;II)V", - garbageValue = "896131991" + signature = "(Lkq;II)V", + garbageValue = "1455704216" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -383,7 +383,7 @@ public class ObjectDefinition extends DualNode { var3 = var1.readUnsignedByte(); if (var3 > 0) { if (this.modelIds != null && !ObjectDefinition_isLowDetail) { - var1.offset += var3 * 2; + var1.offset += 2 * var3; } else { this.models = null; this.modelIds = new int[var3]; @@ -422,7 +422,7 @@ public class ObjectDefinition extends DualNode { } else if (var2 == 29) { this.ambient = var1.readByte(); } else if (var2 == 39) { - this.contrast = var1.readByte() * 25; + this.contrast = var1.readByte(); } else if (var2 >= 30 && var2 < 35) { this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { @@ -491,7 +491,7 @@ public class ObjectDefinition extends DualNode { } else if (var2 == 82) { this.mapIconId = var1.readUnsignedShort(); } else if (var2 == 249) { - this.params = ModelData0.readStringIntParameters(var1, this.params); + this.params = Calendar.readStringIntParameters(var1, this.params); } } else { this.transformVarbit = var1.readUnsignedShort(); @@ -530,9 +530,9 @@ public class ObjectDefinition extends DualNode { @ObfuscatedName("p") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "2054916988" + garbageValue = "-1084171011" ) - public final boolean method4691(int var1) { + public final boolean method4616(int var1) { if (this.models != null) { for (int var4 = 0; var4 < this.models.length; ++var4) { if (this.models[var4] == var1) { @@ -556,10 +556,10 @@ public class ObjectDefinition extends DualNode { } } - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "0" + signature = "(I)Z", + garbageValue = "2142303046" ) @Export("needsModelFiles") public final boolean needsModelFiles() { @@ -576,10 +576,10 @@ public class ObjectDefinition extends DualNode { } } - @ObfuscatedName("y") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(II[[IIIII)Lee;", - garbageValue = "554507629" + signature = "(II[[IIIIB)Lep;", + garbageValue = "-20" ) @Export("getEntity") public final Entity getEntity(int var1, int var2, int[][] var3, int var4, int var5, int var6) { @@ -598,10 +598,10 @@ public class ObjectDefinition extends DualNode { } if (!this.nonFlatShading) { - var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); + var9 = var10.toModel(this.ambient + 64, this.contrast * 25 + 768, -50, -10, -50); } else { var10.ambient = (short)(this.ambient + 64); - var10.contrast = (short)(this.contrast + 768); + var10.contrast = (short)(this.contrast * 25 + 768); var10.calculateVertexNormals(); var9 = var10; } @@ -610,24 +610,24 @@ public class ObjectDefinition extends DualNode { } if (this.nonFlatShading) { - var9 = ((ModelData)var9).method2839(); + var9 = ((ModelData)var9).method2803(); } if (this.clipType * 65536 >= 0) { if (var9 instanceof Model) { var9 = ((Model)var9).contourGround(var3, var4, var5, var6, true, this.clipType * 65536); } else if (var9 instanceof ModelData) { - var9 = ((ModelData)var9).method2819(var3, var4, var5, var6, true, this.clipType * 65536); + var9 = ((ModelData)var9).method2804(var3, var4, var5, var6, true, this.clipType * 65536); } } return (Entity)var9; } - @ObfuscatedName("w") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(II[[IIIIS)Ldf;", - garbageValue = "17896" + signature = "(II[[IIIII)Ldw;", + garbageValue = "287773376" ) @Export("getModel") public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5, int var6) { @@ -645,7 +645,7 @@ public class ObjectDefinition extends DualNode { return null; } - var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); + var9 = var10.toModel(this.ambient + 64, this.contrast * 25 + 768, -50, -10, -50); ObjectDefinition_cachedModels.put(var9, var7); } @@ -656,10 +656,10 @@ public class ObjectDefinition extends DualNode { return var9; } - @ObfuscatedName("i") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(II[[IIIILiy;IB)Ldf;", - garbageValue = "49" + signature = "(II[[IIIILiv;II)Ldw;", + garbageValue = "-1136799681" ) @Export("getModelDynamic") public final Model getModelDynamic(int var1, int var2, int[][] var3, int var4, int var5, int var6, SequenceDefinition var7, int var8) { @@ -677,7 +677,7 @@ public class ObjectDefinition extends DualNode { return null; } - var11 = var12.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); + var11 = var12.toModel(this.ambient + 64, this.contrast * 25 + 768, -50, -10, -50); ObjectDefinition_cachedModels.put(var11, var9); } @@ -698,10 +698,10 @@ public class ObjectDefinition extends DualNode { } } - @ObfuscatedName("k") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(III)Ldq;", - garbageValue = "-391634342" + signature = "(IIB)Ldd;", + garbageValue = "0" ) @Export("getModelData") final ModelData getModelData(int var1, int var2) { @@ -739,19 +739,19 @@ public class ObjectDefinition extends DualNode { } if (var4) { - var3.method2878(); + var3.method2817(); } ObjectDefinition_cachedModelData.put(var3, (long)var7); } if (var5 > 1) { - field3359[var6] = var3; + field3316[var6] = var3; } } if (var5 > 1) { - var3 = new ModelData(field3359, var5); + var3 = new ModelData(field3316, var5); } } else { int var9 = -1; @@ -781,7 +781,7 @@ public class ObjectDefinition extends DualNode { } if (var10) { - var3.method2878(); + var3.method2817(); } ObjectDefinition_cachedModelData.put(var3, (long)var5); @@ -801,19 +801,19 @@ public class ObjectDefinition extends DualNode { var11 = true; } - ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, null == this.recolorFrom, this.retextureFrom == null, true); + ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, null == this.recolorFrom, null == this.retextureFrom, true); if (var1 == 4 && var2 > 3) { - var8.method2822(256); + var8.method2809(256); var8.changeOffset(45, 0, -45); } var2 &= 3; if (var2 == 1) { - var8.method2884(); - } else if (var2 == 2) { var8.method2872(); + } else if (var2 == 2) { + var8.method2807(); } else if (var2 == 3) { - var8.method2823(); + var8.method2798(); } if (this.recolorFrom != null) { @@ -839,16 +839,16 @@ public class ObjectDefinition extends DualNode { return var8; } - @ObfuscatedName("x") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)Lil;", - garbageValue = "1137642576" + signature = "(I)Lig;", + garbageValue = "1498998552" ) @Export("transform") public final ObjectDefinition transform() { int var1 = -1; if (this.transformVarbit != -1) { - var1 = FileSystem.getVarbit(this.transformVarbit); + var1 = GameShell.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -860,46 +860,33 @@ public class ObjectDefinition extends DualNode { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? Occluder.getObjectDefinition(var2) : null; + return var2 != -1 ? Coord.getObjectDefinition(var2) : null; } @ObfuscatedName("o") @ObfuscatedSignature( signature = "(IIB)I", - garbageValue = "1" + garbageValue = "0" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - IterableNodeHashTable var4 = this.params; - int var3; - if (var4 == null) { - var3 = var2; - } else { - IntegerNode var5 = (IntegerNode)var4.get((long)var1); - if (var5 == null) { - var3 = var2; - } else { - var3 = var5.integer; - } - } - - return var3; + return class83.method2071(this.params, var1, var2); } - @ObfuscatedName("e") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(ILjava/lang/String;B)Ljava/lang/String;", - garbageValue = "1" + signature = "(ILjava/lang/String;I)Ljava/lang/String;", + garbageValue = "166992225" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return ServerBuild.method4214(this.params, var1, var2); + return class14.method151(this.params, var1, var2); } - @ObfuscatedName("c") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-422498348" + garbageValue = "2014883324" ) @Export("hasSound") public boolean hasSound() { @@ -908,7 +895,7 @@ public class ObjectDefinition extends DualNode { } else { for (int var1 = 0; var1 < this.transforms.length; ++var1) { if (this.transforms[var1] != -1) { - ObjectDefinition var2 = Occluder.getObjectDefinition(this.transforms[var1]); + ObjectDefinition var2 = Coord.getObjectDefinition(this.transforms[var1]); if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { return true; } @@ -918,876 +905,4 @@ public class ObjectDefinition extends DualNode { return false; } } - - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "(Lbo;I)V", - garbageValue = "-1368226174" - ) - @Export("doCycleTitle") - static void doCycleTitle(GameShell var0) { - int var3; - int var31; - if (Login.worldSelectOpen) { - while (true) { - if (!InvDefinition.isKeyDown()) { - if (MouseHandler.MouseHandler_lastButton != 1 && (JagexCache.mouseCam || MouseHandler.MouseHandler_lastButton != 4)) { - break; - } - - int var1 = Login.xPadding + 280; - if (MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class270.changeWorldSelectSorting(0, 0); - break; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class270.changeWorldSelectSorting(0, 1); - break; - } - - int var2 = Login.xPadding + 390; - if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class270.changeWorldSelectSorting(1, 0); - break; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class270.changeWorldSelectSorting(1, 1); - break; - } - - var3 = Login.xPadding + 500; - if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class270.changeWorldSelectSorting(2, 0); - break; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class270.changeWorldSelectSorting(2, 1); - break; - } - - var31 = Login.xPadding + 610; - if (MouseHandler.MouseHandler_lastPressedX >= var31 && MouseHandler.MouseHandler_lastPressedX <= var31 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class270.changeWorldSelectSorting(3, 0); - break; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var31 + 15 && MouseHandler.MouseHandler_lastPressedX <= var31 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class270.changeWorldSelectSorting(3, 1); - break; - } - - 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; - AbstractByteArrayCopier.leftTitleSprite.drawAt(Login.xPadding, 0); - class319.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - Decimator.logoSprite.drawAt(Login.xPadding + 382 - Decimator.logoSprite.subWidth / 2, 18); - break; - } - - if (Login.hoveredWorldIndex != -1) { - World var5 = Skills.World_worlds[Login.hoveredWorldIndex]; - GrandExchangeOfferAgeComparator.changeWorld(var5); - Login.worldSelectOpen = false; - AbstractByteArrayCopier.leftTitleSprite.drawAt(Login.xPadding, 0); - class319.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - Decimator.logoSprite.drawAt(Login.xPadding + 382 - Decimator.logoSprite.subWidth / 2, 18); - } else { - if (Login.worldSelectPage > 0 && Skills.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= Skills.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= WorldMapCacheName.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= WorldMapCacheName.canvasHeight / 2 + 50) { - --Login.worldSelectPage; - } - - if (Login.worldSelectPage < Login.worldSelectPagesCount && KitDefinition.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= BoundaryObject.canvasWidth - KitDefinition.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= BoundaryObject.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= WorldMapCacheName.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= WorldMapCacheName.canvasHeight / 2 + 50) { - ++Login.worldSelectPage; - } - } - break; - } - - if (class49.field418 == 13) { - Login.worldSelectOpen = false; - AbstractByteArrayCopier.leftTitleSprite.drawAt(Login.xPadding, 0); - class319.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - Decimator.logoSprite.drawAt(Login.xPadding + 382 - Decimator.logoSprite.subWidth / 2, 18); - break; - } - - if (class49.field418 == 96) { - if (Login.worldSelectPage > 0 && Skills.worldSelectLeftSprite != null) { - --Login.worldSelectPage; - } - } else if (class49.field418 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && KitDefinition.worldSelectRightSprite != null) { - ++Login.worldSelectPage; - } - } - - } else { - if ((MouseHandler.MouseHandler_lastButton == 1 || !JagexCache.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { - UserComparator10.clientPreferences.titleMusicDisabled = !UserComparator10.clientPreferences.titleMusicDisabled; - class40.savePreferences(); - if (!UserComparator10.clientPreferences.titleMusicDisabled) { - WorldMapData_0.method191(AbstractWorldMapData.archive6, "scape main", "", 255, false); - } else { - TileItemPile.method2811(); - } - } - - if (Client.gameState != 5) { - if (-1L == Login.field1205) { - Login.field1205 = TaskHandler.currentTimeMillis() + 1000L; - } - - long var20 = TaskHandler.currentTimeMillis(); - if (class4.method63() && -1L == Login.field1206) { - Login.field1206 = var20; - if (Login.field1206 > Login.field1205) { - Login.field1205 = Login.field1206; - } - } - - if (Client.gameState == 10 || Client.gameState == 11) { - if (Language.Language_EN == VarbitDefinition.clientLanguage) { - if (MouseHandler.MouseHandler_lastButton == 1 || !JagexCache.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { - var3 = Login.xPadding + 5; - short var4 = 463; - byte var22 = 100; - byte var6 = 35; - if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var22 + var3 && MouseHandler.MouseHandler_lastPressedY >= var4 && MouseHandler.MouseHandler_lastPressedY <= var6 + var4) { - WorldMapData_0.method187(); - return; - } - } - - if (GrandExchangeOfferOwnWorldComparator.World_request != null) { - WorldMapData_0.method187(); - } - } - - var3 = MouseHandler.MouseHandler_lastButton; - var31 = MouseHandler.MouseHandler_lastPressedX; - int var42 = MouseHandler.MouseHandler_lastPressedY; - if (var3 == 0) { - var31 = MouseHandler.MouseHandler_x; - var42 = MouseHandler.MouseHandler_y; - } - - if (!JagexCache.mouseCam && var3 == 4) { - var3 = 1; - } - - short var34; - int var35; - if (Login.loginIndex == 0) { - boolean var39 = false; - - while (InvDefinition.isKeyDown()) { - if (class49.field418 == 84) { - var39 = true; - } - } - - var35 = GrandExchangeOfferOwnWorldComparator.loginBoxCenter - 80; - var34 = 291; - if (var3 == 1 && var31 >= var35 - 75 && var31 <= var35 + 75 && var42 >= var34 - 20 && var42 <= var34 + 20) { - WorldMapAreaData.openURL(PacketBuffer.method5582("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); - } - - var35 = GrandExchangeOfferOwnWorldComparator.loginBoxCenter + 80; - if (var3 == 1 && var31 >= var35 - 75 && var31 <= var35 + 75 && var42 >= var34 - 20 && var42 <= var34 + 20 || var39) { - 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; - Buddy.method5251(); - } 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; - Buddy.method5251(); - } 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; - Buddy.method5251(); - } else { - class222.Login_promptCredentials(false); - } - } - } else { - short var7; - int var32; - if (Login.loginIndex == 1) { - while (true) { - if (!InvDefinition.isKeyDown()) { - var32 = GrandExchangeOfferOwnWorldComparator.loginBoxCenter - 80; - var7 = 321; - if (var3 == 1 && var31 >= var32 - 75 && var31 <= var32 + 75 && var42 >= var7 - 20 && var42 <= var7 + 20) { - class222.Login_promptCredentials(false); - } - - var32 = GrandExchangeOfferOwnWorldComparator.loginBoxCenter + 80; - if (var3 == 1 && var31 >= var32 - 75 && var31 <= var32 + 75 && var42 >= var7 - 20 && var42 <= var7 + 20) { - Login.loginIndex = 0; - } - break; - } - - if (class49.field418 == 84) { - class222.Login_promptCredentials(false); - } else if (class49.field418 == 13) { - Login.loginIndex = 0; - } - } - } else { - short var33; - boolean var36; - if (Login.loginIndex == 2) { - var33 = 201; - var32 = var33 + 52; - if (var3 == 1 && var42 >= var32 - 12 && var42 < var32 + 2) { - Login.currentLoginField = 0; - } - - var32 += 15; - if (var3 == 1 && var42 >= var32 - 12 && var42 < var32 + 2) { - Login.currentLoginField = 1; - } - - var32 += 15; - var33 = 361; - if (GrandExchangeOfferOwnWorldComparator.field638 != null) { - var35 = GrandExchangeOfferOwnWorldComparator.field638.highX / 2; - if (var3 == 1 && var31 >= GrandExchangeOfferOwnWorldComparator.field638.lowX - var35 && var31 <= var35 + GrandExchangeOfferOwnWorldComparator.field638.lowX && var42 >= var33 - 15 && var42 < var33) { - switch(Login.field1186) { - case 1: - PacketWriter.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: - WorldMapAreaData.openURL("https://support.runescape.com/hc/en-gb", true, false); - } - } - } - - var35 = GrandExchangeOfferOwnWorldComparator.loginBoxCenter - 80; - var34 = 321; - if (var3 == 1 && var31 >= var35 - 75 && var31 <= var35 + 75 && var42 >= var34 - 20 && var42 <= var34 + 20) { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - PacketWriter.setLoginResponseString("", "Please enter your username/email address.", ""); - return; - } - - if (Login.Login_password.length() == 0) { - PacketWriter.setLoginResponseString("", "Please enter your password.", ""); - return; - } - - PacketWriter.setLoginResponseString("", "Connecting to server...", ""); - Canvas.method872(false); - class81.updateGameState(20); - return; - } - - var35 = Login.loginBoxX + 180 + 80; - if (var3 == 1 && var31 >= var35 - 75 && var31 <= var35 + 75 && var42 >= var34 - 20 && var42 <= var34 + 20) { - Login.loginIndex = 0; - Login.Login_username = ""; - Login.Login_password = ""; - class192.field2395 = 0; - WorldMapSection0.otp = ""; - Login.field1196 = true; - } - - var35 = GrandExchangeOfferOwnWorldComparator.loginBoxCenter + -117; - var34 = 277; - Login.field1173 = var31 >= var35 && var31 < var35 + HealthBar.field1115 && var42 >= var34 && var42 < var34 + class40.field348; - if (var3 == 1 && Login.field1173) { - Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; - if (!Client.Login_isUsernameRemembered && UserComparator10.clientPreferences.rememberedUsername != null) { - UserComparator10.clientPreferences.rememberedUsername = null; - class40.savePreferences(); - } - } - - var35 = GrandExchangeOfferOwnWorldComparator.loginBoxCenter + 24; - var34 = 277; - Login.field1195 = var31 >= var35 && var31 < var35 + HealthBar.field1115 && var42 >= var34 && var42 < var34 + class40.field348; - if (var3 == 1 && Login.field1195) { - UserComparator10.clientPreferences.hideUsername = !UserComparator10.clientPreferences.hideUsername; - if (!UserComparator10.clientPreferences.hideUsername) { - Login.Login_username = ""; - UserComparator10.clientPreferences.rememberedUsername = null; - Buddy.method5251(); - } - - class40.savePreferences(); - } - - label1235: - while (true) { - Transferable var24; - int var38; - do { - while (true) { - char var37; - label1149: - do { - while (true) { - while (InvDefinition.isKeyDown()) { - if (class49.field418 != 13) { - if (Login.currentLoginField != 0) { - continue label1149; - } - - DirectByteArrayCopier.method4010(class297.field3699); - if (class49.field418 == 85 && Login.Login_username.length() > 0) { - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (class49.field418 == 84 || class49.field418 == 80) { - Login.currentLoginField = 1; - } - - var37 = class297.field3699; - var36 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var37) != -1; - if (var36 && Login.Login_username.length() < 320) { - Login.Login_username = Login.Login_username + class297.field3699; - } - } else { - Login.loginIndex = 0; - Login.Login_username = ""; - Login.Login_password = ""; - class192.field2395 = 0; - WorldMapSection0.otp = ""; - Login.field1196 = true; - } - } - - return; - } - } while(Login.currentLoginField != 1); - - if (class49.field418 == 85 && Login.Login_password.length() > 0) { - Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); - } else if (class49.field418 == 84 || class49.field418 == 80) { - Login.currentLoginField = 0; - if (class49.field418 == 84) { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - PacketWriter.setLoginResponseString("", "Please enter your username/email address.", ""); - return; - } - - if (Login.Login_password.length() == 0) { - PacketWriter.setLoginResponseString("", "Please enter your password.", ""); - return; - } - - PacketWriter.setLoginResponseString("", "Connecting to server...", ""); - Canvas.method872(false); - class81.updateGameState(20); - return; - } - } - - if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && class49.field418 == 67) { - Clipboard var23 = Toolkit.getDefaultToolkit().getSystemClipboard(); - var24 = var23.getContents(AbstractWorldMapIcon.client); - var38 = 20 - Login.Login_password.length(); - break; - } - - var37 = class297.field3699; - if (var37 >= ' ' && var37 < 127 || var37 > 127 && var37 < 160 || var37 > 160 && var37 <= 255) { - var36 = true; - } else { - label1362: { - if (var37 != 0) { - char[] var26 = class287.cp1252AsciiExtension; - - for (int var27 = 0; var27 < var26.length; ++var27) { - char var13 = var26[var27]; - if (var37 == var13) { - var36 = true; - break label1362; - } - } - } - - var36 = false; - } - } - - if (var36) { - char var43 = class297.field3699; - boolean var11 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var43) != -1; - if (var11 && Login.Login_password.length() < 20) { - Login.Login_password = Login.Login_password + class297.field3699; - } - } - } - } while(var38 <= 0); - - try { - String var12 = (String)var24.getTransferData(DataFlavor.stringFlavor); - int var40 = Math.min(var38, var12.length()); - int var14 = 0; - - while (true) { - if (var14 >= var40) { - Login.Login_password = Login.Login_password + var12.substring(0, var40); - continue label1235; - } - - char var16 = var12.charAt(var14); - boolean var15; - if (var16 >= ' ' && var16 < 127 || var16 > 127 && var16 < 160 || var16 > 160 && var16 <= 255) { - var15 = true; - } else { - label1363: { - if (var16 != 0) { - char[] var17 = class287.cp1252AsciiExtension; - - for (int var18 = 0; var18 < var17.length; ++var18) { - char var19 = var17[var18]; - if (var16 == var19) { - var15 = true; - break label1363; - } - } - } - - var15 = false; - } - } - - if (!var15) { - break; - } - - char var41 = var12.charAt(var14); - boolean var25 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var41) != -1; - if (!var25) { - break; - } - - ++var14; - } - - Login.loginIndex = 3; - return; - } catch (UnsupportedFlavorException var29) { - } catch (IOException var30) { - } - } - } else if (Login.loginIndex == 3) { - var32 = Login.loginBoxX + 180; - var7 = 276; - if (var3 == 1 && var31 >= var32 - 75 && var31 <= var32 + 75 && var42 >= var7 - 20 && var42 <= var7 + 20) { - class222.Login_promptCredentials(false); - } - - var32 = Login.loginBoxX + 180; - var7 = 326; - if (var3 == 1 && var31 >= var32 - 75 && var31 <= var32 + 75 && var42 >= var7 - 20 && var42 <= var7 + 20) { - PacketWriter.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 var9; - if (Login.loginIndex == 4) { - var32 = Login.loginBoxX + 180 - 80; - var7 = 321; - if (var3 == 1 && var31 >= var32 - 75 && var31 <= var32 + 75 && var42 >= var7 - 20 && var42 <= var7 + 20) { - WorldMapSection0.otp.trim(); - if (WorldMapSection0.otp.length() != 6) { - PacketWriter.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); - return; - } - - class192.field2395 = Integer.parseInt(WorldMapSection0.otp); - WorldMapSection0.otp = ""; - Canvas.method872(true); - PacketWriter.setLoginResponseString("", "Connecting to server...", ""); - class81.updateGameState(20); - return; - } - - if (var3 == 1 && var31 >= Login.loginBoxX + 180 - 9 && var31 <= Login.loginBoxX + 180 + 130 && var42 >= 263 && var42 <= 296) { - Login.field1196 = !Login.field1196; - } - - if (var3 == 1 && var31 >= Login.loginBoxX + 180 - 34 && var31 <= Login.loginBoxX + 34 + 180 && var42 >= 351 && var42 <= 363) { - WorldMapAreaData.openURL(PacketBuffer.method5582("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); - } - - var32 = Login.loginBoxX + 180 + 80; - if (var3 == 1 && var31 >= var32 - 75 && var31 <= var32 + 75 && var42 >= var7 - 20 && var42 <= var7 + 20) { - Login.loginIndex = 0; - Login.Login_username = ""; - Login.Login_password = ""; - class192.field2395 = 0; - WorldMapSection0.otp = ""; - } - - while (InvDefinition.isKeyDown()) { - boolean var8 = false; - - for (var9 = 0; var9 < "1234567890".length(); ++var9) { - if (class297.field3699 == "1234567890".charAt(var9)) { - var8 = true; - break; - } - } - - if (class49.field418 == 13) { - Login.loginIndex = 0; - Login.Login_username = ""; - Login.Login_password = ""; - class192.field2395 = 0; - WorldMapSection0.otp = ""; - } else { - if (class49.field418 == 85 && WorldMapSection0.otp.length() > 0) { - WorldMapSection0.otp = WorldMapSection0.otp.substring(0, WorldMapSection0.otp.length() - 1); - } - - if (class49.field418 == 84) { - WorldMapSection0.otp.trim(); - if (WorldMapSection0.otp.length() != 6) { - PacketWriter.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); - return; - } - - class192.field2395 = Integer.parseInt(WorldMapSection0.otp); - WorldMapSection0.otp = ""; - Canvas.method872(true); - PacketWriter.setLoginResponseString("", "Connecting to server...", ""); - class81.updateGameState(20); - return; - } - - if (var8 && WorldMapSection0.otp.length() < 6) { - WorldMapSection0.otp = WorldMapSection0.otp + class297.field3699; - } - } - } - } else if (Login.loginIndex == 5) { - var32 = Login.loginBoxX + 180 - 80; - var7 = 321; - if (var3 == 1 && var31 >= var32 - 75 && var31 <= var32 + 75 && var42 >= var7 - 20 && var42 <= var7 + 20) { - ScriptFrame.method1163(); - return; - } - - var32 = Login.loginBoxX + 180 + 80; - if (var3 == 1 && var31 >= var32 - 75 && var31 <= var32 + 75 && var42 >= var7 - 20 && var42 <= var7 + 20) { - class222.Login_promptCredentials(true); - } - - var34 = 361; - if (class186.field2342 != null) { - var9 = class186.field2342.highX / 2; - if (var3 == 1 && var31 >= class186.field2342.lowX - var9 && var31 <= var9 + class186.field2342.lowX && var42 >= var34 - 15 && var42 < var34) { - WorldMapAreaData.openURL(PacketBuffer.method5582("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); - } - } - - while (InvDefinition.isKeyDown()) { - var36 = false; - - for (int var10 = 0; var10 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var10) { - if (class297.field3699 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var10)) { - var36 = true; - break; - } - } - - if (class49.field418 == 13) { - class222.Login_promptCredentials(true); - } else { - if (class49.field418 == 85 && Login.Login_username.length() > 0) { - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (class49.field418 == 84) { - ScriptFrame.method1163(); - return; - } - - if (var36 && Login.Login_username.length() < 320) { - Login.Login_username = Login.Login_username + class297.field3699; - } - } - } - } else if (Login.loginIndex != 6) { - if (Login.loginIndex == 7) { - var32 = Login.loginBoxX + 180 - 80; - var7 = 321; - if (var3 == 1 && var31 >= var32 - 75 && var31 <= var32 + 75 && var42 >= var7 - 20 && var42 <= var7 + 20) { - WorldMapAreaData.openURL(PacketBuffer.method5582("secure", true) + "m=dob/set_dob.ws", true, false); - PacketWriter.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); - Login.loginIndex = 6; - return; - } - - var32 = Login.loginBoxX + 180 + 80; - if (var3 == 1 && var31 >= var32 - 75 && var31 <= var32 + 75 && var42 >= var7 - 20 && var42 <= var7 + 20) { - class222.Login_promptCredentials(true); - } - } else if (Login.loginIndex == 8) { - var32 = Login.loginBoxX + 180 - 80; - var7 = 321; - if (var3 == 1 && var31 >= var32 - 75 && var31 <= var32 + 75 && var42 >= var7 - 20 && var42 <= var7 + 20) { - WorldMapAreaData.openURL("https://www.jagex.com/terms/privacy/#eight", true, false); - PacketWriter.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); - Login.loginIndex = 6; - return; - } - - var32 = Login.loginBoxX + 180 + 80; - if (var3 == 1 && var31 >= var32 - 75 && var31 <= var32 + 75 && var42 >= var7 - 20 && var42 <= var7 + 20) { - class222.Login_promptCredentials(true); - } - } else if (Login.loginIndex == 12) { - String var28 = ""; - switch(Login.field1185) { - case 0: - var28 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; - break; - case 1: - var28 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; - break; - default: - class222.Login_promptCredentials(false); - } - - var35 = Login.loginBoxX + 180; - var34 = 276; - if (var3 == 1 && var31 >= var35 - 75 && var31 <= var35 + 75 && var42 >= var34 - 20 && var42 <= var34 + 20) { - WorldMapAreaData.openURL(var28, true, false); - PacketWriter.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); - Login.loginIndex = 6; - return; - } - - var35 = Login.loginBoxX + 180; - var34 = 326; - if (var3 == 1 && var31 >= var35 - 75 && var31 <= var35 + 75 && var42 >= var34 - 20 && var42 <= var34 + 20) { - class222.Login_promptCredentials(false); - } - } else if (Login.loginIndex == 24) { - var32 = Login.loginBoxX + 180; - var7 = 301; - if (var3 == 1 && var31 >= var32 - 75 && var31 <= var32 + 75 && var42 >= var7 - 20 && var42 <= var7 + 20) { - class222.Login_promptCredentials(false); - } - } - } else { - while (true) { - do { - if (!InvDefinition.isKeyDown()) { - var33 = 321; - if (var3 == 1 && var42 >= var33 - 20 && var42 <= var33 + 20) { - class222.Login_promptCredentials(true); - } - - return; - } - } while(class49.field418 != 84 && class49.field418 != 13); - - class222.Login_promptCredentials(true); - } - } - } - } - } - - } - } - } - } - - @ObfuscatedName("jb") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-256216527" - ) - @Export("changeGameOptions") - static final void changeGameOptions(int var0) { - class312.method6006(); - - for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var1.obj != null) { - var1.set(); - } - } - - int var4 = NetCache.VarpDefinition_get(var0).type; - if (var4 != 0) { - int var2 = Varps.Varps_main[var0]; - if (var4 == 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); - } - - class60.method1194(); - } - - 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.musicVolume) { - if (Client.musicVolume == 0 && Client.currentTrackGroupId != -1) { - class65.playMusicTrack(AbstractWorldMapData.archive6, Client.currentTrackGroupId, 0, var3, false); - Client.field742 = false; - } else if (var3 == 0) { - TileItemPile.method2811(); - Client.field742 = false; - } else { - TilePaint.method3103(var3); - } - - Client.musicVolume = var3; - } - } - - 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.field807 = var2; - } - - if (var4 == 10) { - if (var2 == 0) { - Client.areaSoundEffectVolume = 127; - } - - if (var2 == 1) { - Client.areaSoundEffectVolume = 96; - } - - if (var2 == 2) { - Client.areaSoundEffectVolume = 64; - } - - if (var2 == 3) { - Client.areaSoundEffectVolume = 32; - } - - if (var2 == 4) { - Client.areaSoundEffectVolume = 0; - } - } - - if (var4 == 17) { - Client.followerIndex = var2 & 65535; - } - - AttackOption[] var5; - if (var4 == 18) { - var5 = new AttackOption[]{AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_hidden, AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_leftClickWhereAvailable}; - Client.playerAttackOption = (AttackOption)CollisionMap.findEnumerated(var5, 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) { - var5 = new AttackOption[]{AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_hidden, AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_leftClickWhereAvailable}; - Client.npcAttackOption = (AttackOption)CollisionMap.findEnumerated(var5, var2); - if (Client.npcAttackOption == null) { - Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; - } - } - - } - } } diff --git a/runescape-client/src/main/java/ObjectNode.java b/runescape-client/src/main/java/ObjectNode.java index 2d1ed5b976..44d9d8b8ff 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("fa") +@ObfuscatedName("ga") @Implements("ObjectNode") public class ObjectNode extends Node { - @ObfuscatedName("u") + @ObfuscatedName("f") @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 7dad55c6ad..0fe556b3c6 100644 --- a/runescape-client/src/main/java/ObjectSound.java +++ b/runescape-client/src/main/java/ObjectSound.java @@ -4,87 +4,87 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bc") +@ObfuscatedName("br") @Implements("ObjectSound") public final class ObjectSound extends Node { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Ljd;" + signature = "Ljs;" ) @Export("objectSounds") static NodeDeque objectSounds; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -284752301 + intValue = -1656698135 ) @Export("plane") int plane; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -320634943 + intValue = 1779559040 ) @Export("x") int x; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 351853767 + intValue = -718591763 ) @Export("y") int y; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = 1257144143 - ) - int field1074; @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -889892259 + intValue = 787274277 ) - int field1071; - @ObfuscatedName("h") + int field1064; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -919807871 + intValue = -1137525137 ) - int field1072; - @ObfuscatedName("y") + int field1052; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1412550033 + intValue = 245525821 + ) + int field1053; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 1263233623 ) @Export("soundEffectId") int soundEffectId; - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Lds;" + signature = "Ldg;" ) @Export("stream1") RawPcmStream stream1; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 851722869 + intValue = -938588117 ) - int field1075; - @ObfuscatedName("k") + int field1060; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1188723059 + intValue = -1891052931 ) - int field1076; - @ObfuscatedName("x") + int field1061; + @ObfuscatedName("o") @Export("soundEffectIds") int[] soundEffectIds; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1209496197 + intValue = 2003220669 ) - int field1078; - @ObfuscatedName("e") + int field1055; + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lds;" + signature = "Ldg;" ) @Export("stream2") RawPcmStream stream2; - @ObfuscatedName("n") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lil;" + signature = "Lig;" ) @Export("obj") ObjectDefinition obj; @@ -96,10 +96,10 @@ public final class ObjectSound extends Node { ObjectSound() { } - @ObfuscatedName("u") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1485735851" + garbageValue = "448933263" ) @Export("set") void set() { @@ -107,44 +107,22 @@ public final class ObjectSound extends Node { ObjectDefinition var2 = this.obj.transform(); if (var2 != null) { this.soundEffectId = var2.ambientSoundId; - this.field1072 = var2.int4 * 128; - this.field1075 = var2.int5; - this.field1076 = var2.int6; + this.field1053 = var2.int4 * 128; + this.field1060 = var2.int5; + this.field1061 = var2.int6; this.soundEffectIds = var2.soundEffectIds; } else { this.soundEffectId = -1; - this.field1072 = 0; - this.field1075 = 0; - this.field1076 = 0; + this.field1053 = 0; + this.field1060 = 0; + this.field1061 = 0; this.soundEffectIds = null; } if (var1 != this.soundEffectId && this.stream1 != null) { - ClientPacket.pcmStreamMixer.removeSubStream(this.stream1); + Tiles.pcmStreamMixer.removeSubStream(this.stream1); this.stream1 = null; } } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "([BI)[B", - garbageValue = "-359888333" - ) - public static byte[] method1935(byte[] var0) { - int var1 = var0.length; - byte[] var2 = new byte[var1]; - System.arraycopy(var0, 0, var2, 0, var1); - return var2; - } - - @ObfuscatedName("ky") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "7" - ) - static final void method1936() { - Client.field836 = Client.cycleCntr; - WorldMapID.ClanChat_inClanChat = true; - } } diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java index 047de36993..58de607017 100644 --- a/runescape-client/src/main/java/Occluder.java +++ b/runescape-client/src/main/java/Occluder.java @@ -4,174 +4,240 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ej") +@ObfuscatedName("en") @Implements("Occluder") public final class Occluder { - @ObfuscatedName("u") + @ObfuscatedName("ix") @ObfuscatedGetter( - intValue = -868680993 + intValue = 1520705785 + ) + @Export("selectedItemWidget") + static int selectedItemWidget; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -2004521327 ) @Export("minTileX") int minTileX; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -78813791 + intValue = -1674295637 ) @Export("maxTileX") int maxTileX; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -307237447 + intValue = 1042040177 ) @Export("minTileY") int minTileY; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -772985783 + intValue = 1841371547 ) @Export("maxTileY") int maxTileY; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1542494109 + intValue = 261600229 ) @Export("type") int type; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -291894415 + intValue = -471906197 ) @Export("minX") int minX; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -724655561 + intValue = 1905687081 ) @Export("maxX") int maxX; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 686060305 + intValue = -528006911 ) @Export("minZ") int minZ; - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 2092987209 + intValue = -1092367399 ) @Export("maxZ") int maxZ; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -264626047 + intValue = 1309728231 ) @Export("minY") int minY; - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1980036159 + intValue = -1242772351 ) @Export("maxY") int maxY; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -1409166921 - ) - int field1896; @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -307213361 + intValue = 574320151 ) - int field1897; - @ObfuscatedName("e") + int field1877; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1941150605 + intValue = -1784945639 ) - int field1898; - @ObfuscatedName("n") + int field1878; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1179191271 + intValue = -894832855 ) - int field1900; - @ObfuscatedName("r") + int field1879; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1336984119 + intValue = -350981301 ) - int field1890; - @ObfuscatedName("c") + int field1880; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -863399609 + intValue = -186008605 ) - int field1901; - @ObfuscatedName("a") + int field1881; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1653375525 + intValue = 512854933 ) - int field1902; + int field1875; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -503970767 + ) + int field1872; Occluder() { } - @ObfuscatedName("f") + @ObfuscatedName("ka") @ObfuscatedSignature( - signature = "(II)Lil;", - garbageValue = "513049272" + signature = "(Lha;IIIB)V", + garbageValue = "1" ) - @Export("getObjectDefinition") - public static ObjectDefinition getObjectDefinition(int var0) { - ObjectDefinition var1 = (ObjectDefinition)ObjectDefinition.ObjectDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = ObjectDefinition.ObjectDefinition_archive.takeFile(6, var0); - var1 = new ObjectDefinition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); + @Export("drawMinimap") + static final void drawMinimap(Widget var0, int var1, int var2, int var3) { + WorldMapLabel.playPcmPlayers(); + SpriteMask var4 = var0.getSpriteMask(false); + if (var4 != null) { + Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); + if (Client.minimapState != 2 && Client.minimapState != 5) { + int var5 = Client.camAngleY & 2047; + int var6 = Message.localPlayer.x / 32 + 48; + int var7 = 464 - Message.localPlayer.y / 32; + Language.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); + + int var8; + int var9; + int var10; + for (var8 = 0; var8 < Client.mapIconCount; ++var8) { + var9 = Client.mapIconXs[var8] * 4 + 2 - Message.localPlayer.x / 32; + var10 = Client.mapIconYs[var8] * 4 + 2 - Message.localPlayer.y / 32; + GrandExchangeOfferNameComparator.drawSpriteOnMinimap(var1, var2, var9, var10, Client.mapIcons[var8], var4); + } + + int var11; + int var12; + for (var8 = 0; var8 < 104; ++var8) { + for (var9 = 0; var9 < 104; ++var9) { + NodeDeque var15 = Client.groundItems[UrlRequest.Client_plane][var8][var9]; + if (var15 != null) { + var11 = var8 * 4 + 2 - Message.localPlayer.x / 32; + var12 = var9 * 4 + 2 - Message.localPlayer.y / 32; + GrandExchangeOfferNameComparator.drawSpriteOnMinimap(var1, var2, var11, var12, WorldMapLabel.mapDotSprites[0], var4); + } + } + } + + for (var8 = 0; var8 < Client.npcCount; ++var8) { + NPC var16 = Client.npcs[Client.npcIndices[var8]]; + if (var16 != null && var16.isVisible()) { + NPCDefinition var18 = var16.definition; + if (var18 != null && var18.transforms != null) { + var18 = var18.transform(); + } + + if (var18 != null && var18.drawMapDot && var18.isInteractable) { + var11 = var16.x / 32 - Message.localPlayer.x / 32; + var12 = var16.y / 32 - Message.localPlayer.y / 32; + GrandExchangeOfferNameComparator.drawSpriteOnMinimap(var1, var2, var11, var12, WorldMapLabel.mapDotSprites[1], var4); + } + } + } + + var8 = Players.Players_count; + int[] var19 = Players.Players_indices; + + for (var10 = 0; var10 < var8; ++var10) { + Player var17 = Client.players[var19[var10]]; + if (var17 != null && var17.isVisible() && !var17.isHidden && var17 != Message.localPlayer) { + var12 = var17.x / 32 - Message.localPlayer.x / 32; + int var13 = var17.y / 32 - Message.localPlayer.y / 32; + boolean var14 = false; + if (Message.localPlayer.team != 0 && var17.team != 0 && var17.team == Message.localPlayer.team) { + var14 = true; + } + + if (var17.isFriend()) { + GrandExchangeOfferNameComparator.drawSpriteOnMinimap(var1, var2, var12, var13, WorldMapLabel.mapDotSprites[3], var4); + } else if (var14) { + GrandExchangeOfferNameComparator.drawSpriteOnMinimap(var1, var2, var12, var13, WorldMapLabel.mapDotSprites[4], var4); + } else if (var17.isClanMember()) { + GrandExchangeOfferNameComparator.drawSpriteOnMinimap(var1, var2, var12, var13, WorldMapLabel.mapDotSprites[5], var4); + } else { + GrandExchangeOfferNameComparator.drawSpriteOnMinimap(var1, var2, var12, var13, WorldMapLabel.mapDotSprites[2], var4); + } + } + } + + if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { + if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { + NPC var20 = Client.npcs[Client.hintArrowNpcIndex]; + if (var20 != null) { + var11 = var20.x / 32 - Message.localPlayer.x / 32; + var12 = var20.y / 32 - Message.localPlayer.y / 32; + InvDefinition.worldToMinimap(var1, var2, var11, var12, Varps.mapMarkerSprites[1], var4); + } + } + + if (Client.hintArrowType == 2) { + var10 = Client.hintArrowX * 4 - MusicPatchPcmStream.baseX * 256 + 2 - Message.localPlayer.x / 32; + var11 = Client.hintArrowY * 4 - ScriptEvent.baseY * 256 + 2 - Message.localPlayer.y / 32; + InvDefinition.worldToMinimap(var1, var2, var10, var11, Varps.mapMarkerSprites[1], var4); + } + + if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { + Player var21 = Client.players[Client.hintArrowPlayerIndex]; + if (var21 != null) { + var11 = var21.x / 32 - Message.localPlayer.x / 32; + var12 = var21.y / 32 - Message.localPlayer.y / 32; + InvDefinition.worldToMinimap(var1, var2, var11, var12, Varps.mapMarkerSprites[1], var4); + } + } + } + + if (Client.destinationX != 0) { + var10 = Client.destinationX * 4 + 2 - Message.localPlayer.x / 32; + var11 = Client.destinationY * 4 + 2 - Message.localPlayer.y / 32; + GrandExchangeOfferNameComparator.drawSpriteOnMinimap(var1, var2, var10, var11, Varps.mapMarkerSprites[0], var4); + } + + if (!Message.localPlayer.isHidden) { + Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215); + } + } else { + Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); } - var1.postDecode(); - if (var1.isSolid) { - var1.interactType = 0; - var1.boolean1 = false; - } - - ObjectDefinition.ObjectDefinition_cached.put(var1, (long)var0); - return var1; + Client.field834[var3] = true; } } - - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1792672505" - ) - public static void method3336() { - WorldMapElement.WorldMapElement_cachedSprites.clear(); - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(B)Lln;", - garbageValue = "0" - ) - static Sprite method3338() { - Sprite var0 = new Sprite(); - var0.width = class325.SpriteBuffer_spriteWidth; - var0.height = UserComparator9.SpriteBuffer_spriteHeight; - var0.xOffset = UrlRequester.SpriteBuffer_xOffsets[0]; - var0.yOffset = class216.SpriteBuffer_yOffsets[0]; - var0.subWidth = class325.SpriteBuffer_spriteWidths[0]; - var0.subHeight = VarcInt.SpriteBuffer_spriteHeights[0]; - int var1 = var0.subHeight * var0.subWidth; - byte[] var2 = FillMode.SpriteBuffer_pixels[0]; - var0.pixels = new int[var1]; - - for (int var3 = 0; var3 < var1; ++var3) { - var0.pixels[var3] = class325.SpriteBuffer_spritePalette[var2[var3] & 255]; - } - - PcmPlayer.method2510(); - return var0; - } } diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java index adfdba6efa..60df722322 100644 --- a/runescape-client/src/main/java/PacketBuffer.java +++ b/runescape-client/src/main/java/PacketBuffer.java @@ -4,86 +4,86 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kj") +@ObfuscatedName("kl") @Implements("PacketBuffer") public class PacketBuffer extends Buffer { + @ObfuscatedName("i") + static final int[] field3699; @ObfuscatedName("f") - static final int[] field3701; - @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lld;" + signature = "Llr;" ) @Export("isaacCipher") IsaacCipher isaacCipher; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 477467837 + intValue = 113356883 ) @Export("bitIndex") int bitIndex; static { - field3701 = 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}; + field3699 = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1}; } public PacketBuffer(int var1) { super(var1); } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "([II)V", - garbageValue = "-1040500949" + garbageValue = "1103059700" ) @Export("newIsaacCipher") public void newIsaacCipher(int[] var1) { this.isaacCipher = new IsaacCipher(var1); } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lld;I)V", - garbageValue = "-1849401074" + signature = "(Llr;I)V", + garbageValue = "66749042" ) @Export("setIsaacCipher") public void setIsaacCipher(IsaacCipher var1) { this.isaacCipher = var1; } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "230891954" + garbageValue = "278121039" ) @Export("writeByteIsaac") public void writeByteIsaac(int var1) { super.array[++super.offset - 1] = (byte)(var1 + this.isaacCipher.nextInt()); } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1535940248" + garbageValue = "-288227059" ) @Export("readByteIsaac") public int readByteIsaac() { return super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-1671006897" + signature = "(B)Z", + garbageValue = "-44" ) - public boolean method5581() { - int var1 = super.array[super.offset] - this.isaacCipher.method6331() & 255; + public boolean method5492() { + int var1 = super.array[super.offset] - this.isaacCipher.method6305() & 255; return var1 >= 128; } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(S)I", - garbageValue = "8240" + signature = "(B)I", + garbageValue = "27" ) @Export("readSmartByteShortIsaac") public int readSmartByteShortIsaac() { @@ -91,32 +91,32 @@ public class PacketBuffer extends Buffer { return var1 < 128 ? var1 : (var1 - 128 << 8) + (super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255); } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "([BIII)V", - garbageValue = "-739226773" + garbageValue = "-1375824422" ) - public void method5551(byte[] var1, int var2, int var3) { + public void method5494(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("y") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1010448885" + garbageValue = "-1633102130" ) @Export("importIndex") public void importIndex() { this.bitIndex = super.offset * 8; } - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( signature = "(II)I", - garbageValue = "-1257473008" + garbageValue = "-804748280" ) @Export("readBits") public int readBits(int var1) { @@ -125,64 +125,36 @@ public class PacketBuffer extends Buffer { int var4 = 0; for (this.bitIndex += var1; var1 > var3; var3 = 8) { - var4 += (super.array[var2++] & field3701[var3]) << var1 - var3; + var4 += (super.array[var2++] & field3699[var3]) << var1 - var3; var1 -= var3; } if (var3 == var1) { - var4 += super.array[var2] & field3701[var3]; + var4 += super.array[var2] & field3699[var3]; } else { - var4 += super.array[var2] >> var3 - var1 & field3701[var1]; + var4 += super.array[var2] >> var3 - var1 & field3699[var1]; } return var4; } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1450699347" + garbageValue = "1487381592" ) @Export("exportIndex") public void exportIndex() { super.offset = (this.bitIndex + 7) / 8; } - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "1950209579" + signature = "(IB)I", + garbageValue = "8" ) @Export("bitsRemaining") public int bitsRemaining(int var1) { return var1 * 8 - this.bitIndex; } - - @ObfuscatedName("ko") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;ZI)Ljava/lang/String;", - garbageValue = "-117055056" - ) - static String method5582(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"; - } - - String var3 = ""; - if (WorldMapManager.field327 != null) { - var3 = "/p=" + WorldMapManager.field327; - } - - String var4 = "runescape.com"; - return var2 + var0 + "." + var4 + "/l=" + VarbitDefinition.clientLanguage + "/a=" + class13.field91 + var3 + "/"; - } } diff --git a/runescape-client/src/main/java/PacketBufferNode.java b/runescape-client/src/main/java/PacketBufferNode.java index 32399fc37b..c03d531a00 100644 --- a/runescape-client/src/main/java/PacketBufferNode.java +++ b/runescape-client/src/main/java/PacketBufferNode.java @@ -4,42 +4,50 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gx") +@ObfuscatedName("fz") @Implements("PacketBufferNode") public class PacketBufferNode extends Node { - @ObfuscatedName("z") + @ObfuscatedName("rf") + @ObfuscatedGetter( + intValue = -1075361135 + ) + static int field2310; + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "[Lgx;" + signature = "[Lfz;" ) @Export("PacketBufferNode_packetBufferNodes") - static PacketBufferNode[] PacketBufferNode_packetBufferNodes; - @ObfuscatedName("p") + public static PacketBufferNode[] PacketBufferNode_packetBufferNodes; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1218907641 + intValue = 1681870953 ) @Export("PacketBufferNode_packetBufferNodeCount") - static int PacketBufferNode_packetBufferNodeCount; - @ObfuscatedName("u") + public static int PacketBufferNode_packetBufferNodeCount; + @ObfuscatedName("o") + @Export("Tiles_lightness") + static int[] Tiles_lightness; + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfh;" ) @Export("clientPacket") - ClientPacket clientPacket; - @ObfuscatedName("f") + public ClientPacket clientPacket; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 328924249 + intValue = -1093975901 ) @Export("clientPacketLength") - int clientPacketLength; - @ObfuscatedName("b") + public int clientPacketLength; + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lkj;" + signature = "Lkl;" ) @Export("packetBuffer") public PacketBuffer packetBuffer; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1715023791 + intValue = 468956445 ) @Export("index") public int index; @@ -49,13 +57,10 @@ public class PacketBufferNode extends Node { PacketBufferNode_packetBufferNodeCount = 0; } - PacketBufferNode() { - } - - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "13" + signature = "(I)V", + garbageValue = "-2117853277" ) @Export("release") public void release() { @@ -64,21 +69,73 @@ public class PacketBufferNode extends Node { } } - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(Lhf;I)V", - garbageValue = "-628490328" - ) - public static void method3679(AbstractArchive var0) { - EnumDefinition.EnumDefinition_archive = var0; - } - @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-380587936" + signature = "(IB)Lii;", + garbageValue = "57" ) - static final void method3670() { - WorldMapSection2.method347("Your friend list is full. Max of 200 for free users, and 400 for members"); + @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 = UserComparator10.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 (!ItemDefinition.ItemDefinition_inMembersWorld && var1.isMembersOnly) { + var1.name = "Members object"; + var1.isTradable = false; + var1.groundActions = null; + var1.inventoryActions = null; + var1.shiftClickIndex = -1; + var1.team = 0; + if (var1.params != null) { + boolean var3 = false; + + for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { + ParamDefinition var5 = WorldMapIcon_1.getParamDefinition((int)var4.key); + if (var5.autoDisable) { + var4.remove(); + } else { + var3 = true; + } + } + + if (!var3) { + var1.params = null; + } + } + } + + ItemDefinition.ItemDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "1234199679" + ) + public static void method3587() { + FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); } } diff --git a/runescape-client/src/main/java/PacketWriter.java b/runescape-client/src/main/java/PacketWriter.java index 7c4efa89e1..0552f2c77b 100644 --- a/runescape-client/src/main/java/PacketWriter.java +++ b/runescape-client/src/main/java/PacketWriter.java @@ -5,85 +5,85 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cc") +@ObfuscatedName("cr") @Implements("PacketWriter") public class PacketWriter { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lkn;" + signature = "Lky;" ) @Export("socket") AbstractSocket socket; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Ljm;" + signature = "Ljl;" ) @Export("packetBufferNodes") IterableNodeDeque packetBufferNodes; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 521861757 + intValue = -1004782805 ) @Export("bufferSize") int bufferSize; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lkg;" + signature = "Lkq;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lld;" + signature = "Llr;" ) @Export("isaacCipher") public IsaacCipher isaacCipher; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "Lkj;" + signature = "Lkl;" ) @Export("packetBuffer") PacketBuffer packetBuffer; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) @Export("serverPacket") ServerPacket serverPacket; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 710985365 + intValue = -374140173 ) @Export("serverPacketLength") int serverPacketLength; - @ObfuscatedName("w") - boolean field1307; - @ObfuscatedName("i") + @ObfuscatedName("a") + boolean field1297; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -931864145 + intValue = -597988403 ) - int field1305; - @ObfuscatedName("k") + int field1298; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1482623051 + intValue = -1139758715 ) @Export("pendingWrites") int pendingWrites; - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Lgm;" - ) - ServerPacket field1299; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - ServerPacket field1311; - @ObfuscatedName("e") + ServerPacket field1300; + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - ServerPacket field1312; + ServerPacket field1301; + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "Lfw;" + ) + ServerPacket field1299; PacketWriter() { this.packetBufferNodes = new IterableNodeDeque(); @@ -92,15 +92,15 @@ public class PacketWriter { this.packetBuffer = new PacketBuffer(40000); this.serverPacket = null; this.serverPacketLength = 0; - this.field1307 = true; - this.field1305 = 0; + this.field1297 = true; + this.field1298 = 0; this.pendingWrites = 0; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "-2" + garbageValue = "-39" ) @Export("clearBuffer") final void clearBuffer() { @@ -108,10 +108,10 @@ public class PacketWriter { this.bufferSize = 0; } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-2064967142" + garbageValue = "-1865358367" ) @Export("flush") final void flush() throws IOException { @@ -136,10 +136,10 @@ public class PacketWriter { } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Lgx;B)V", - garbageValue = "3" + signature = "(Lfz;I)V", + garbageValue = "-2113796206" ) @Export("addNode") public final void addNode(PacketBufferNode var1) { @@ -149,20 +149,20 @@ public class PacketWriter { this.bufferSize += var1.index; } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lkn;I)V", - garbageValue = "-1959151046" + signature = "(Lky;I)V", + garbageValue = "-180486775" ) @Export("setSocket") void setSocket(AbstractSocket var1) { this.socket = var1; } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1017159330" + garbageValue = "1795782145" ) @Export("close") void close() { @@ -173,145 +173,23 @@ public class PacketWriter { } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-90" + signature = "(I)V", + garbageValue = "-2001412741" ) @Export("removeSocket") void removeSocket() { this.socket = null; } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(B)Lkn;", - garbageValue = "115" + signature = "(I)Lky;", + garbageValue = "-160473860" ) @Export("getSocket") AbstractSocket getSocket() { return this.socket; } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(IIIIIII)I", - garbageValue = "62079839" - ) - public static int method2292(int var0, int var1, int var2, int var3, int var4, int var5) { - if ((var5 & 1) == 1) { - int var6 = var3; - var3 = var4; - var4 = var6; - } - - var2 &= 3; - if (var2 == 0) { - return var0; - } else if (var2 == 1) { - return var1; - } else { - return var2 == 2 ? 7 - var0 - (var3 - 1) : 7 - var1 - (var4 - 1); - } - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(CLgc;B)C", - garbageValue = "-6" - ) - @Export("standardizeChar") - static char standardizeChar(char var0, Language var1) { - if (var0 >= 192 && var0 <= 255) { - if (var0 >= 192 && var0 <= 198) { - return 'A'; - } - - if (var0 == 199) { - return 'C'; - } - - if (var0 >= 200 && var0 <= 203) { - return 'E'; - } - - if (var0 >= 204 && var0 <= 207) { - return 'I'; - } - - if (var0 == 209 && var1 != Language.Language_ES) { - return 'N'; - } - - if (var0 >= 210 && var0 <= 214) { - return 'O'; - } - - if (var0 >= 217 && var0 <= 220) { - return 'U'; - } - - if (var0 == 221) { - return 'Y'; - } - - if (var0 == 223) { - return 's'; - } - - if (var0 >= 224 && var0 <= 230) { - return 'a'; - } - - if (var0 == 231) { - return 'c'; - } - - if (var0 >= 232 && var0 <= 235) { - return 'e'; - } - - if (var0 >= 236 && var0 <= 239) { - return 'i'; - } - - if (var0 == 241 && var1 != Language.Language_ES) { - return 'n'; - } - - if (var0 >= 242 && var0 <= 246) { - return 'o'; - } - - if (var0 >= 249 && var0 <= 252) { - return 'u'; - } - - if (var0 == 253 || var0 == 255) { - return 'y'; - } - } - - if (var0 == 338) { - return 'O'; - } else if (var0 == 339) { - return 'o'; - } else if (var0 == 376) { - return 'Y'; - } else { - return var0; - } - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;S)V", - garbageValue = "11034" - ) - @Export("setLoginResponseString") - static void setLoginResponseString(String var0, String var1, String var2) { - Login.Login_response1 = var0; - Login.Login_response2 = var1; - Login.Login_response3 = var2; - } } diff --git a/runescape-client/src/main/java/ParamDefinition.java b/runescape-client/src/main/java/ParamDefinition.java index 0f347cd3ae..1655bfae4d 100644 --- a/runescape-client/src/main/java/ParamDefinition.java +++ b/runescape-client/src/main/java/ParamDefinition.java @@ -4,34 +4,39 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("io") +@ObfuscatedName("ij") @Implements("ParamDefinition") public class ParamDefinition extends DualNode { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lhf;" + signature = "Lhz;" ) @Export("ParamDefinition_archive") public static AbstractArchive ParamDefinition_archive; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lef;" + signature = "Leb;" ) @Export("ParamDefinition_cached") static EvictingDualNodeHashTable ParamDefinition_cached; - @ObfuscatedName("b") + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 975160711 + ) + public static int field3275; + @ObfuscatedName("y") @Export("type") char type; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1135873659 + intValue = -2128344831 ) @Export("defaultInt") public int defaultInt; - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("p") + @ObfuscatedName("b") @Export("autoDisable") boolean autoDisable; @@ -43,19 +48,19 @@ public class ParamDefinition extends DualNode { this.autoDisable = true; } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "127" + garbageValue = "1" ) @Export("postDecode") void postDecode() { } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Lkg;B)V", - garbageValue = "17" + signature = "(Lkq;I)V", + garbageValue = "1148377951" ) @Export("decode") void decode(Buffer var1) { @@ -69,31 +74,15 @@ public class ParamDefinition extends DualNode { } } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lkg;II)V", - garbageValue = "-1607275245" + signature = "(Lkq;II)V", + garbageValue = "-301062602" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { - byte var4 = var1.readByte(); - int var5 = var4 & 255; - if (var5 == 0) { - throw new IllegalArgumentException("" + Integer.toString(var5, 16)); - } - - if (var5 >= 128 && var5 < 160) { - char var6 = class287.cp1252AsciiExtension[var5 - 128]; - if (var6 == 0) { - var6 = '?'; - } - - var5 = var6; - } - - char var3 = (char)var5; - this.type = var3; + this.type = AbstractArchive.method4124(var1.readByte()); } else if (var2 == 2) { this.defaultInt = var1.readInt(); } else if (var2 == 4) { @@ -104,354 +93,51 @@ public class ParamDefinition extends DualNode { } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1761356775" + garbageValue = "-22777972" ) @Export("isString") public boolean isString() { return this.type == 's'; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(IIILfg;Lfh;Z[I[II)I", - garbageValue = "1370585226" + signature = "([Ljava/lang/String;[SIII)V", + garbageValue = "1392375255" ) - public static int method4612(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4, boolean var5, int[] var6, int[] var7) { - int var9; - for (int var8 = 0; var8 < 128; ++var8) { - for (var9 = 0; var9 < 128; ++var9) { - class173.directions[var8][var9] = 0; - class173.distances[var8][var9] = 99999999; + @Export("sortItemsByName") + public static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) { + if (var2 < var3) { + int var4 = (var3 + var2) / 2; + int var5 = var2; + String var6 = var0[var4]; + var0[var4] = var0[var3]; + var0[var3] = var6; + short var7 = var1[var4]; + var1[var4] = var1[var3]; + var1[var3] = var7; + + for (int var8 = var2; var8 < var3; ++var8) { + if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { + String var9 = var0[var8]; + var0[var8] = var0[var5]; + var0[var5] = var9; + short var10 = var1[var8]; + var1[var8] = var1[var5]; + var1[var5++] = var10; + } } + + var0[var3] = var0[var5]; + var0[var5] = var6; + var1[var3] = var1[var5]; + var1[var5] = var7; + sortItemsByName(var0, var1, var2, var5 - 1); + sortItemsByName(var0, var1, var5 + 1, var3); } - int var10; - int var11; - byte var13; - int var14; - int var15; - int var17; - int var19; - int var20; - int var21; - int var22; - boolean var28; - int var30; - int var31; - int var33; - if (var2 == 1) { - var28 = WorldMapLabel.method434(var0, var1, var3, var4); - } else if (var2 == 2) { - var28 = GameObject.method3342(var0, var1, var3, var4); - } else { - var10 = var0; - var11 = var1; - byte var12 = 64; - var13 = 64; - var14 = var0 - var12; - var15 = var1 - var13; - class173.directions[var12][var13] = 99; - class173.distances[var12][var13] = 0; - byte var16 = 0; - var17 = 0; - class173.bufferX[var16] = var0; - var33 = var16 + 1; - class173.bufferY[var16] = var1; - int[][] var27 = var4.flags; - - boolean var29; - label454: - while (true) { - label452: - while (true) { - do { - do { - do { - label429: - do { - if (var33 == var17) { - class173.field2103 = var10; - class173.field2100 = var11; - var29 = false; - break label454; - } - - var10 = class173.bufferX[var17]; - var11 = class173.bufferY[var17]; - var17 = var17 + 1 & 4095; - var30 = var10 - var14; - var31 = var11 - var15; - var19 = var10 - var4.xInset; - var20 = var11 - var4.yInset; - if (var3.hasArrived(var2, var10, var11, var4)) { - class173.field2103 = var10; - class173.field2100 = var11; - var29 = true; - break label454; - } - - var21 = class173.distances[var30][var31] + 1; - if (var30 > 0 && class173.directions[var30 - 1][var31] == 0 && (var27[var19 - 1][var20] & 19136782) == 0 && (var27[var19 - 1][var20 + var2 - 1] & 19136824) == 0) { - var22 = 1; - - while (true) { - if (var22 >= var2 - 1) { - class173.bufferX[var33] = var10 - 1; - class173.bufferY[var33] = var11; - var33 = var33 + 1 & 4095; - class173.directions[var30 - 1][var31] = 2; - class173.distances[var30 - 1][var31] = var21; - break; - } - - if ((var27[var19 - 1][var20 + var22] & 19136830) != 0) { - break; - } - - ++var22; - } - } - - if (var30 < 128 - var2 && class173.directions[var30 + 1][var31] == 0 && (var27[var19 + var2][var20] & 19136899) == 0 && (var27[var19 + var2][var20 + var2 - 1] & 19136992) == 0) { - var22 = 1; - - while (true) { - if (var22 >= var2 - 1) { - class173.bufferX[var33] = var10 + 1; - class173.bufferY[var33] = var11; - var33 = var33 + 1 & 4095; - class173.directions[var30 + 1][var31] = 8; - class173.distances[var30 + 1][var31] = var21; - break; - } - - if ((var27[var19 + var2][var22 + var20] & 19136995) != 0) { - break; - } - - ++var22; - } - } - - if (var31 > 0 && class173.directions[var30][var31 - 1] == 0 && (var27[var19][var20 - 1] & 19136782) == 0 && (var27[var19 + var2 - 1][var20 - 1] & 19136899) == 0) { - var22 = 1; - - while (true) { - if (var22 >= var2 - 1) { - class173.bufferX[var33] = var10; - class173.bufferY[var33] = var11 - 1; - var33 = var33 + 1 & 4095; - class173.directions[var30][var31 - 1] = 1; - class173.distances[var30][var31 - 1] = var21; - break; - } - - if ((var27[var19 + var22][var20 - 1] & 19136911) != 0) { - break; - } - - ++var22; - } - } - - if (var31 < 128 - var2 && class173.directions[var30][var31 + 1] == 0 && (var27[var19][var20 + var2] & 19136824) == 0 && (var27[var19 + var2 - 1][var20 + var2] & 19136992) == 0) { - var22 = 1; - - while (true) { - if (var22 >= var2 - 1) { - class173.bufferX[var33] = var10; - class173.bufferY[var33] = var11 + 1; - var33 = var33 + 1 & 4095; - class173.directions[var30][var31 + 1] = 4; - class173.distances[var30][var31 + 1] = var21; - break; - } - - if ((var27[var19 + var22][var20 + var2] & 19137016) != 0) { - break; - } - - ++var22; - } - } - - if (var30 > 0 && var31 > 0 && class173.directions[var30 - 1][var31 - 1] == 0 && (var27[var19 - 1][var20 - 1] & 19136782) == 0) { - var22 = 1; - - while (true) { - if (var22 >= var2) { - class173.bufferX[var33] = var10 - 1; - class173.bufferY[var33] = var11 - 1; - var33 = var33 + 1 & 4095; - class173.directions[var30 - 1][var31 - 1] = 3; - class173.distances[var30 - 1][var31 - 1] = var21; - break; - } - - if ((var27[var19 - 1][var22 + (var20 - 1)] & 19136830) != 0 || (var27[var22 + (var19 - 1)][var20 - 1] & 19136911) != 0) { - break; - } - - ++var22; - } - } - - if (var30 < 128 - var2 && var31 > 0 && class173.directions[var30 + 1][var31 - 1] == 0 && (var27[var19 + var2][var20 - 1] & 19136899) == 0) { - var22 = 1; - - while (true) { - if (var22 >= var2) { - class173.bufferX[var33] = var10 + 1; - class173.bufferY[var33] = var11 - 1; - var33 = var33 + 1 & 4095; - class173.directions[var30 + 1][var31 - 1] = 9; - class173.distances[var30 + 1][var31 - 1] = var21; - break; - } - - if ((var27[var19 + var2][var22 + (var20 - 1)] & 19136995) != 0 || (var27[var19 + var22][var20 - 1] & 19136911) != 0) { - break; - } - - ++var22; - } - } - - if (var30 > 0 && var31 < 128 - var2 && class173.directions[var30 - 1][var31 + 1] == 0 && (var27[var19 - 1][var20 + var2] & 19136824) == 0) { - for (var22 = 1; var22 < var2; ++var22) { - if ((var27[var19 - 1][var20 + var22] & 19136830) != 0 || (var27[var22 + (var19 - 1)][var20 + var2] & 19137016) != 0) { - continue label429; - } - } - - class173.bufferX[var33] = var10 - 1; - class173.bufferY[var33] = var11 + 1; - var33 = var33 + 1 & 4095; - class173.directions[var30 - 1][var31 + 1] = 6; - class173.distances[var30 - 1][var31 + 1] = var21; - } - } while(var30 >= 128 - var2); - } while(var31 >= 128 - var2); - } while(class173.directions[var30 + 1][var31 + 1] != 0); - } while((var27[var19 + var2][var20 + var2] & 19136992) != 0); - - for (var22 = 1; var22 < var2; ++var22) { - if ((var27[var22 + var19][var20 + var2] & 19137016) != 0 || (var27[var19 + var2][var22 + var20] & 19136995) != 0) { - continue label452; - } - } - - class173.bufferX[var33] = var10 + 1; - class173.bufferY[var33] = var11 + 1; - var33 = var33 + 1 & 4095; - class173.directions[var30 + 1][var31 + 1] = 12; - class173.distances[var30 + 1][var31 + 1] = var21; - } - } - - var28 = var29; - } - - var9 = var0 - 64; - var10 = var1 - 64; - var11 = class173.field2103; - var30 = class173.field2100; - if (!var28) { - var31 = Integer.MAX_VALUE; - var14 = Integer.MAX_VALUE; - byte var32 = 10; - var33 = var3.approxDestinationX; - var17 = var3.approxDestinationY; - int var18 = var3.approxDestinationSizeX; - var19 = var3.approxDestinationSizeY; - - for (var20 = var33 - var32; var20 <= var33 + var32; ++var20) { - for (var21 = var17 - var32; var21 <= var32 + var17; ++var21) { - var22 = var20 - var9; - int var23 = var21 - var10; - if (var22 >= 0 && var23 >= 0 && var22 < 128 && var23 < 128 && class173.distances[var22][var23] < 100) { - int var24 = 0; - if (var20 < var33) { - var24 = var33 - var20; - } else if (var20 > var18 + var33 - 1) { - var24 = var20 - (var18 + var33 - 1); - } - - int var25 = 0; - if (var21 < var17) { - var25 = var17 - var21; - } else if (var21 > var17 + var19 - 1) { - var25 = var21 - (var19 + var17 - 1); - } - - int var26 = var24 * var24 + var25 * var25; - if (var26 < var31 || var26 == var31 && class173.distances[var22][var23] < var14) { - var31 = var26; - var14 = class173.distances[var22][var23]; - var11 = var20; - var30 = var21; - } - } - } - } - - if (var31 == Integer.MAX_VALUE) { - return -1; - } - } - - if (var0 == var11 && var30 == var1) { - return 0; - } else { - var13 = 0; - class173.bufferX[var13] = var11; - var31 = var13 + 1; - class173.bufferY[var13] = var30; - - for (var14 = var15 = class173.directions[var11 - var9][var30 - var10]; var0 != var11 || var30 != var1; var14 = class173.directions[var11 - var9][var30 - var10]) { - if (var14 != var15) { - var15 = var14; - class173.bufferX[var31] = var11; - class173.bufferY[var31++] = var30; - } - - if ((var14 & 2) != 0) { - ++var11; - } else if ((var14 & 8) != 0) { - --var11; - } - - if ((var14 & 1) != 0) { - ++var30; - } else if ((var14 & 4) != 0) { - --var30; - } - } - - var33 = 0; - - while (var31-- > 0) { - var6[var33] = class173.bufferX[var31]; - var7[var33++] = class173.bufferY[var31]; - if (var33 >= var6.length) { - break; - } - } - - return var33; - } - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1049391968" - ) - public static final void method4611() { - ViewportMouse.ViewportMouse_isInViewport = false; - ViewportMouse.ViewportMouse_entityCount = 0; } } diff --git a/runescape-client/src/main/java/PcmPlayer.java b/runescape-client/src/main/java/PcmPlayer.java index 064f71c6ce..8e95a55584 100644 --- a/runescape-client/src/main/java/PcmPlayer.java +++ b/runescape-client/src/main/java/PcmPlayer.java @@ -1,211 +1,193 @@ -import java.util.concurrent.ScheduledExecutorService; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("de") +@ObfuscatedName("cw") @Implements("PcmPlayer") public class PcmPlayer { - @ObfuscatedName("p") - @Export("PcmPlayer_stereo") - protected static boolean PcmPlayer_stereo; - @ObfuscatedName("y") - @Export("soundSystemExecutor") - static ScheduledExecutorService soundSystemExecutor; - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Ldc;" - ) - @Export("soundSystem") - static SoundSystem soundSystem; - @ObfuscatedName("fc") - @ObfuscatedSignature( - signature = "Lkn;" - ) - static AbstractSocket field1413; - @ObfuscatedName("e") + @ObfuscatedName("k") @Export("samples") protected int[] samples; - @ObfuscatedName("n") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Ldt;" + signature = "Ldl;" ) @Export("stream") PcmStream stream; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 78939647 + intValue = 870880097 ) - int field1396; - @ObfuscatedName("c") + int field1372; + @ObfuscatedName("t") @ObfuscatedGetter( - longValue = -143263282379705379L + longValue = -2578951154982885373L ) @Export("timeMs") long timeMs; - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 519126893 + intValue = -1002919953 ) @Export("capacity") int capacity; - @ObfuscatedName("d") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1108114601 + intValue = 1574476853 ) - int field1401; - @ObfuscatedName("s") + int field1373; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1542098097 + intValue = -87074955 ) - int field1402; - @ObfuscatedName("t") + int field1376; + @ObfuscatedName("z") @ObfuscatedGetter( - longValue = -5404263653312830565L + longValue = 4761654115835358543L ) - long field1405; + long field1377; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 500699263 + ) + int field1371; @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1907349045 + intValue = 1630467439 ) - int field1406; - @ObfuscatedName("v") + int field1382; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 850216769 + intValue = -1827156113 ) - int field1404; + int field1380; + @ObfuscatedName("r") + @ObfuscatedGetter( + longValue = -9078760105487350149L + ) + long field1381; @ObfuscatedName("q") + boolean field1378; + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -1870292623 + intValue = 199004789 ) - int field1393; - @ObfuscatedName("l") - @ObfuscatedGetter( - longValue = 8086263838612894667L - ) - long field1407; - @ObfuscatedName("j") - boolean field1398; - @ObfuscatedName("ao") - @ObfuscatedGetter( - intValue = 657489915 - ) - int field1409; - @ObfuscatedName("aw") + int field1375; + @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "[Ldt;" + signature = "[Ldl;" ) - PcmStream[] field1410; - @ObfuscatedName("ak") + PcmStream[] field1384; + @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "[Ldt;" + signature = "[Ldl;" ) - PcmStream[] field1411; + PcmStream[] field1385; protected PcmPlayer() { - this.field1396 = 32; - this.timeMs = TaskHandler.currentTimeMillis(); - this.field1405 = 0L; - this.field1406 = 0; - this.field1404 = 0; - this.field1393 = 0; - this.field1407 = 0L; - this.field1398 = true; - this.field1409 = 0; - this.field1410 = new PcmStream[8]; - this.field1411 = new PcmStream[8]; + this.field1372 = 32; + this.timeMs = WorldMapID.currentTimeMillis(); + this.field1377 = 0L; + this.field1371 = 0; + this.field1382 = 0; + this.field1380 = 0; + this.field1381 = 0L; + this.field1378 = true; + this.field1375 = 0; + this.field1384 = new PcmStream[8]; + this.field1385 = new PcmStream[8]; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "347893346" + signature = "(B)V", + garbageValue = "15" ) @Export("init") protected void init() throws Exception { } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "25" + signature = "(II)V", + garbageValue = "797185937" ) @Export("open") protected void open(int var1) throws Exception { } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "80" + signature = "(I)I", + garbageValue = "2013132005" ) @Export("position") protected int position() throws Exception { return this.capacity; } - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("write") protected void write() throws Exception { } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1441503616" + signature = "(S)V", + garbageValue = "390" ) @Export("close") protected void close() { } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "45" + signature = "(I)V", + garbageValue = "1127195595" ) @Export("discard") protected void discard() throws Exception { } - @ObfuscatedName("am") + @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "(Ldt;B)V", - garbageValue = "-11" + signature = "(Ldl;I)V", + garbageValue = "-126312603" ) @Export("setStream") public final synchronized void setStream(PcmStream var1) { this.stream = var1; } - @ObfuscatedName("ai") + @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "344107964" + signature = "(B)V", + garbageValue = "23" ) @Export("run") public final synchronized void run() { if (this.samples != null) { - long var1 = TaskHandler.currentTimeMillis(); + long var1 = WorldMapID.currentTimeMillis(); try { - if (this.field1405 != 0L) { - if (var1 < this.field1405) { + if (this.field1377 != 0L) { + if (var1 < this.field1377) { return; } this.open(this.capacity); - this.field1405 = 0L; - this.field1398 = true; + this.field1377 = 0L; + this.field1378 = true; } int var3 = this.position(); - if (this.field1393 - var3 > this.field1406) { - this.field1406 = this.field1393 - var3; + if (this.field1380 - var3 > this.field1371) { + this.field1371 = this.field1380 - var3; } - int var4 = this.field1401 + this.field1402; + int var4 = this.field1376 + this.field1373; if (var4 + 256 > 16384) { var4 = 16128; } @@ -219,10 +201,10 @@ public class PcmPlayer { this.close(); this.open(this.capacity); var3 = 0; - this.field1398 = true; + this.field1378 = true; if (var4 + 256 > this.capacity) { var4 = this.capacity - 256; - this.field1402 = var4 - this.field1401; + this.field1376 = var4 - this.field1373; } } @@ -232,38 +214,38 @@ public class PcmPlayer { var3 += 256; } - if (var1 > this.field1407) { - if (!this.field1398) { - if (this.field1406 == 0 && this.field1404 == 0) { + if (var1 > this.field1381) { + if (!this.field1378) { + if (this.field1371 == 0 && this.field1382 == 0) { this.close(); - this.field1405 = var1 + 2000L; + this.field1377 = var1 + 2000L; return; } - this.field1402 = Math.min(this.field1404, this.field1406); - this.field1404 = this.field1406; + this.field1376 = Math.min(this.field1382, this.field1371); + this.field1382 = this.field1371; } else { - this.field1398 = false; + this.field1378 = false; } - this.field1406 = 0; - this.field1407 = 2000L + var1; + this.field1371 = 0; + this.field1381 = 2000L + var1; } - this.field1393 = var3; + this.field1380 = var3; } catch (Exception var7) { this.close(); - this.field1405 = 2000L + var1; + this.field1377 = 2000L + var1; } try { - if (var1 > 500000L + this.timeMs) { + if (var1 > this.timeMs + 500000L) { var1 = this.timeMs; } - while (var1 > 5000L + this.timeMs) { + while (var1 > this.timeMs + 5000L) { this.skip(256); - this.timeMs += (long)(256000 / Messages.PcmPlayer_sampleRate); + this.timeMs += (long)(256000 / (DirectByteArrayCopier.field2490 * -168449264)); } } catch (Exception var6) { this.timeMs = var1; @@ -272,57 +254,57 @@ public class PcmPlayer { } } - @ObfuscatedName("ag") - @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "-4762" - ) - public final void method2458() { - this.field1398 = true; - } - - @ObfuscatedName("ao") + @ObfuscatedName("an") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "1" + garbageValue = "63" + ) + public final void method2472() { + this.field1378 = true; + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-536403943" ) @Export("tryDiscard") public final synchronized void tryDiscard() { - this.field1398 = true; + this.field1378 = true; try { this.discard(); } catch (Exception var2) { this.close(); - this.field1405 = TaskHandler.currentTimeMillis() + 2000L; + this.field1377 = WorldMapID.currentTimeMillis() + 2000L; } } - @ObfuscatedName("aw") + @ObfuscatedName("az") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1132905799" + garbageValue = "-991727159" ) @Export("shutdown") public final synchronized void shutdown() { - if (soundSystem != null) { + if (HealthBar.soundSystem != null) { boolean var1 = true; for (int var2 = 0; var2 < 2; ++var2) { - if (this == soundSystem.players[var2]) { - soundSystem.players[var2] = null; + if (this == HealthBar.soundSystem.players[var2]) { + HealthBar.soundSystem.players[var2] = null; } - if (soundSystem.players[var2] != null) { + if (HealthBar.soundSystem.players[var2] != null) { var1 = false; } } if (var1) { - soundSystemExecutor.shutdownNow(); - soundSystemExecutor = null; - soundSystem = null; + FriendSystem.soundSystemExecutor.shutdownNow(); + FriendSystem.soundSystemExecutor = null; + HealthBar.soundSystem = null; } } @@ -330,16 +312,16 @@ public class PcmPlayer { this.samples = null; } - @ObfuscatedName("ak") + @ObfuscatedName("ay") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "8" + signature = "(II)V", + garbageValue = "1228622505" ) @Export("skip") final void skip(int var1) { - this.field1409 -= var1; - if (this.field1409 < 0) { - this.field1409 = 0; + this.field1375 -= var1; + if (this.field1375 < 0) { + this.field1375 = 0; } if (this.stream != null) { @@ -348,20 +330,20 @@ public class PcmPlayer { } - @ObfuscatedName("aa") + @ObfuscatedName("ag") @Export("fill") final void fill(int[] var1, int var2) { int var3 = var2; - if (PcmPlayer_stereo) { + if (SoundCache.PcmPlayer_stereo) { var3 = var2 << 1; } class300.clearIntArray(var1, 0, var3); - this.field1409 -= var2; - if (this.stream != null && this.field1409 <= 0) { - this.field1409 += Messages.PcmPlayer_sampleRate >> 4; - class1.PcmStream_disable(this.stream); - this.method2452(this.stream, this.stream.vmethod2741()); + this.field1375 -= var2; + if (this.stream != null && this.field1375 <= 0) { + this.field1375 += DirectByteArrayCopier.field2490 * -168449264 >> 4; + ChatChannel.PcmStream_disable(this.stream); + this.method2432(this.stream, this.stream.vmethod2716()); int var4 = 0; int var5 = 255; @@ -383,7 +365,7 @@ public class PcmPlayer { if ((var9 & 1) != 0) { var5 &= ~(1 << var7); var10 = null; - PcmStream var11 = this.field1410[var7]; + PcmStream var11 = this.field1384[var7]; label98: while (true) { @@ -399,33 +381,33 @@ public class PcmPlayer { var11 = var11.after; } else { var11.active = true; - int var13 = var11.vmethod3963(); + int var13 = var11.vmethod3889(); var4 += var13; if (var12 != null) { var12.position += var13; } - if (var4 >= this.field1396) { + if (var4 >= this.field1372) { break label104; } PcmStream var14 = var11.firstSubStream(); if (var14 != null) { - for (int var15 = var11.field1483; var14 != null; var14 = var11.nextSubStream()) { - this.method2452(var14, var15 * var14.vmethod2741() >> 8); + for (int var15 = var11.field1454; var14 != null; var14 = var11.nextSubStream()) { + this.method2432(var14, var15 * var14.vmethod2716() >> 8); } } PcmStream var18 = var11.after; var11.after = null; if (var10 == null) { - this.field1410[var7] = var18; + this.field1384[var7] = var18; } else { var10.after = var18; } if (var18 == null) { - this.field1411[var7] = var10; + this.field1385[var7] = var10; } var11 = var18; @@ -440,9 +422,9 @@ public class PcmPlayer { } for (var6 = 0; var6 < 8; ++var6) { - PcmStream var16 = this.field1410[var6]; - PcmStream[] var17 = this.field1410; - this.field1411[var6] = null; + PcmStream var16 = this.field1384[var6]; + PcmStream[] var17 = this.field1384; + this.field1385[var6] = null; for (var17[var6] = null; var16 != null; var16 = var10) { var10 = var16.after; @@ -451,87 +433,58 @@ public class PcmPlayer { } } - if (this.field1409 < 0) { - this.field1409 = 0; + if (this.field1375 < 0) { + this.field1375 = 0; } if (this.stream != null) { this.stream.fill(var1, 0, var2); } - this.timeMs = TaskHandler.currentTimeMillis(); + this.timeMs = WorldMapID.currentTimeMillis(); } - @ObfuscatedName("ar") + @ObfuscatedName("al") @ObfuscatedSignature( - signature = "(Ldt;II)V", - garbageValue = "1065299389" + signature = "(Ldl;II)V", + garbageValue = "-919759733" ) - final void method2452(PcmStream var1, int var2) { + final void method2432(PcmStream var1, int var2) { int var3 = var2 >> 5; - PcmStream var4 = this.field1411[var3]; + PcmStream var4 = this.field1385[var3]; if (var4 == null) { - this.field1410[var3] = var1; + this.field1384[var3] = var1; } else { var4.after = var1; } - this.field1411[var3] = var1; - var1.field1483 = var2; + this.field1385[var3] = var1; + var1.field1454 = var2; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "180" + signature = "(III)V", + garbageValue = "1686341177" ) - static void method2510() { - UrlRequester.SpriteBuffer_xOffsets = null; - class216.SpriteBuffer_yOffsets = null; - class325.SpriteBuffer_spriteWidths = null; - VarcInt.SpriteBuffer_spriteHeights = null; - class325.SpriteBuffer_spritePalette = null; - FillMode.SpriteBuffer_pixels = 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; - @ObfuscatedName("it") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "264863950" - ) - static final void method2509() { - boolean var0 = false; - - while (!var0) { - var0 = true; - - for (int var1 = 0; var1 < Client.menuOptionsCount - 1; ++var1) { - if (Client.menuOpcodes[var1] < 1000 && Client.menuOpcodes[var1 + 1] > 1000) { - String var2 = Client.menuTargets[var1]; - Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; - Client.menuTargets[var1 + 1] = var2; - String var3 = Client.menuActions[var1]; - Client.menuActions[var1] = Client.menuActions[var1 + 1]; - Client.menuActions[var1 + 1] = var3; - int var4 = Client.menuOpcodes[var1]; - Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; - Client.menuOpcodes[var1 + 1] = var4; - var4 = Client.menuArguments1[var1]; - Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; - Client.menuArguments1[var1 + 1] = var4; - var4 = Client.menuArguments2[var1]; - Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; - Client.menuArguments2[var1 + 1] = var4; - var4 = Client.menuIdentifiers[var1]; - Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; - Client.menuIdentifiers[var1 + 1] = var4; - boolean var5 = Client.menuShiftClick[var1]; - Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; - Client.menuShiftClick[var1 + 1] = var5; - var0 = false; - } + 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; + class192.sortWorlds(class162.World_worlds, 0, class162.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); } } diff --git a/runescape-client/src/main/java/PcmStream.java b/runescape-client/src/main/java/PcmStream.java index c3b8afbae3..16869375ed 100644 --- a/runescape-client/src/main/java/PcmStream.java +++ b/runescape-client/src/main/java/PcmStream.java @@ -3,23 +3,23 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dt") +@ObfuscatedName("dl") @Implements("PcmStream") public abstract class PcmStream extends Node { @ObfuscatedName("w") @Export("active") volatile boolean active; - @ObfuscatedName("c") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Ldt;" + signature = "Ldl;" ) @Export("after") PcmStream after; - @ObfuscatedName("a") - int field1483; - @ObfuscatedName("d") + @ObfuscatedName("j") + int field1454; + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Ldl;" + signature = "Lds;" ) @Export("sound") AbstractSound sound; @@ -28,37 +28,37 @@ public abstract class PcmStream extends Node { this.active = true; } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "()Ldt;" + signature = "()Ldl;" ) @Export("firstSubStream") protected abstract PcmStream firstSubStream(); - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "()Ldt;" + signature = "()Ldl;" ) @Export("nextSubStream") protected abstract PcmStream nextSubStream(); - @ObfuscatedName("y") - protected abstract int vmethod3963(); + @ObfuscatedName("x") + protected abstract int vmethod3889(); - @ObfuscatedName("w") + @ObfuscatedName("a") @Export("fill") protected abstract void fill(int[] var1, int var2, int var3); - @ObfuscatedName("k") + @ObfuscatedName("c") @Export("skip") protected abstract void skip(int var1); @ObfuscatedName("at") - int vmethod2741() { + int vmethod2716() { return 255; } - @ObfuscatedName("fz") + @ObfuscatedName("fn") @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 9dd1d5e891..c4d83305c4 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("ca") +@ObfuscatedName("cy") @Implements("PcmStreamMixer") public class PcmStreamMixer extends PcmStream { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Ljd;" + signature = "Ljs;" ) @Export("subStreams") NodeDeque subStreams; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Ljd;" + signature = "Ljs;" ) - NodeDeque field1326; - @ObfuscatedName("b") - int field1328; - @ObfuscatedName("g") - int field1329; + NodeDeque field1303; + @ObfuscatedName("y") + int field1305; + @ObfuscatedName("p") + int field1306; public PcmStreamMixer() { this.subStreams = new NodeDeque(); - this.field1326 = new NodeDeque(); - this.field1328 = 0; - this.field1329 = -1; + this.field1303 = new NodeDeque(); + this.field1305 = 0; + this.field1306 = -1; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Ldt;)V" + signature = "(Ldl;)V" ) @Export("addSubStream") public final synchronized void addSubStream(PcmStream var1) { this.subStreams.addLast(var1); } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Ldt;)V" + signature = "(Ldl;)V" ) @Export("removeSubStream") public final synchronized void removeSubStream(PcmStream var1) { var1.remove(); } - @ObfuscatedName("b") - void method2332() { - if (this.field1328 > 0) { - for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field1326.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field1326.previous()) { - var1.field1440 -= this.field1328; + @ObfuscatedName("y") + void method2300() { + if (this.field1305 > 0) { + for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field1303.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field1303.previous()) { + var1.field1410 -= this.field1305; } - this.field1329 -= this.field1328; - this.field1328 = 0; + this.field1306 -= this.field1305; + this.field1305 = 0; } } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lfb;Ldp;)V" + signature = "(Lgk;Ldf;)V" ) - void method2330(Node var1, PcmStreamMixerListener var2) { - while (this.field1326.sentinel != var1 && ((PcmStreamMixerListener)var1).field1440 <= var2.field1440) { + void method2309(Node var1, PcmStreamMixerListener var2) { + while (this.field1303.sentinel != var1 && ((PcmStreamMixerListener)var1).field1410 <= var2.field1410) { var1 = var1.previous; } NodeDeque.NodeDeque_addBefore(var2, var1); - this.field1329 = ((PcmStreamMixerListener)this.field1326.sentinel.previous).field1440; - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "(Ldp;)V" - ) - void method2322(PcmStreamMixerListener var1) { - var1.remove(); - var1.remove2(); - Node var2 = this.field1326.sentinel.previous; - if (var2 == this.field1326.sentinel) { - this.field1329 = -1; - } else { - this.field1329 = ((PcmStreamMixerListener)var2).field1440; - } - + this.field1306 = ((PcmStreamMixerListener)this.field1303.sentinel.previous).field1410; } @ObfuscatedName("p") @ObfuscatedSignature( - signature = "()Ldt;" + signature = "(Ldf;)V" + ) + void method2302(PcmStreamMixerListener var1) { + var1.remove(); + var1.remove2(); + Node var2 = this.field1303.sentinel.previous; + if (var2 == this.field1303.sentinel) { + this.field1306 = -1; + } else { + this.field1306 = ((PcmStreamMixerListener)var2).field1410; + } + + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + signature = "()Ldl;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { return (PcmStream)this.subStreams.last(); } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "()Ldt;" + signature = "()Ldl;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { return (PcmStream)this.subStreams.previous(); } - @ObfuscatedName("y") - protected int vmethod3963() { + @ObfuscatedName("x") + protected int vmethod3889() { return 0; } - @ObfuscatedName("w") + @ObfuscatedName("a") @Export("fill") public final synchronized void fill(int[] var1, int var2, int var3) { do { - if (this.field1329 < 0) { + if (this.field1306 < 0) { this.updateSubStreams(var1, var2, var3); return; } - if (var3 + this.field1328 < this.field1329) { - this.field1328 += var3; + if (var3 + this.field1305 < this.field1306) { + this.field1305 += var3; this.updateSubStreams(var1, var2, var3); return; } - int var4 = this.field1329 - this.field1328; + int var4 = this.field1306 - this.field1305; this.updateSubStreams(var1, var2, var4); var2 += var4; var3 -= var4; - this.field1328 += var4; - this.method2332(); - PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field1326.last(); + this.field1305 += var4; + this.method2300(); + PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field1303.last(); synchronized(var5) { int var7 = var5.update(); if (var7 < 0) { - var5.field1440 = 0; - this.method2322(var5); + var5.field1410 = 0; + this.method2302(var5); } else { - var5.field1440 = var7; - this.method2330(var5.previous, var5); + var5.field1410 = var7; + this.method2309(var5.previous, var5); } } } while(var3 != 0); } - @ObfuscatedName("i") + @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("k") + @ObfuscatedName("c") @Export("skip") public final synchronized void skip(int var1) { do { - if (this.field1329 < 0) { + if (this.field1306 < 0) { this.skipSubStreams(var1); return; } - if (this.field1328 + var1 < this.field1329) { - this.field1328 += var1; + if (this.field1305 + var1 < this.field1306) { + this.field1305 += var1; this.skipSubStreams(var1); return; } - int var2 = this.field1329 - this.field1328; + int var2 = this.field1306 - this.field1305; this.skipSubStreams(var2); var1 -= var2; - this.field1328 += var2; - this.method2332(); - PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field1326.last(); + this.field1305 += var2; + this.method2300(); + PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field1303.last(); synchronized(var3) { int var5 = var3.update(); if (var5 < 0) { - var3.field1440 = 0; - this.method2322(var3); + var3.field1410 = 0; + this.method2302(var3); } else { - var3.field1440 = var5; - this.method2330(var3.previous, var3); + var3.field1410 = var5; + this.method2309(var3.previous, var3); } } } while(var1 != 0); } - @ObfuscatedName("x") + @ObfuscatedName("o") @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 925ce21db4..dd9c888307 100644 --- a/runescape-client/src/main/java/PcmStreamMixerListener.java +++ b/runescape-client/src/main/java/PcmStreamMixerListener.java @@ -3,19 +3,19 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dp") +@ObfuscatedName("df") @Implements("PcmStreamMixerListener") public abstract class PcmStreamMixerListener extends Node { - @ObfuscatedName("u") - int field1440; + @ObfuscatedName("f") + int field1410; - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("remove2") abstract void remove2(); - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lca;)I" + signature = "(Lcy;)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 165c78a184..e6e10180cd 100644 --- a/runescape-client/src/main/java/PendingSpawn.java +++ b/runescape-client/src/main/java/PendingSpawn.java @@ -2,88 +2,76 @@ 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("be") +@ObfuscatedName("bh") @Implements("PendingSpawn") public final class PendingSpawn extends Node { - @ObfuscatedName("qu") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 756269056 - ) - static int field925; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = 2040420297 - ) - @Export("cacheGamebuild") - public static int cacheGamebuild; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 842281271 + intValue = 844166729 ) @Export("plane") int plane; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1195330125 + intValue = 377421093 ) @Export("type") int type; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -521000553 + intValue = -1257246671 ) @Export("x") int x; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -156944661 + intValue = 1319343831 ) @Export("y") int y; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 2076612057 + intValue = 2111575223 ) @Export("objectId") int objectId; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1798753117 + intValue = -135346951 ) - int field929; - @ObfuscatedName("h") + int field911; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1153270233 + intValue = -2066167261 ) - int field924; - @ObfuscatedName("y") + int field912; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 37593595 + intValue = -530727913 ) @Export("id") int id; - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -87951589 + intValue = 1202721073 ) @Export("orientation") int orientation; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 894134175 + intValue = -1258720415 ) - int field927; - @ObfuscatedName("k") + int field918; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1990017955 + intValue = 1975686607 ) @Export("delay") int delay; - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 458330281 + intValue = 614220967 ) @Export("hitpoints") int hitpoints; @@ -92,59 +80,4 @@ public final class PendingSpawn extends Node { this.delay = 0; this.hitpoints = -1; } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(ZZB)Llm;", - garbageValue = "0" - ) - static IndexedSprite method1753(boolean var0, boolean var1) { - return var0 ? (var1 ? StructDefinition.field3315 : Varps.options_buttons_2Sprite) : (var1 ? Login.field1179 : InterfaceParent.options_buttons_0Sprite); - } - - @ObfuscatedName("iw") - @ObfuscatedSignature( - signature = "(Lhl;III)V", - garbageValue = "648761441" - ) - @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); - } - - } - - @ObfuscatedName("jx") - @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-547734374" - ) - static boolean method1751() { - return Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; - } } diff --git a/runescape-client/src/main/java/PlatformInfo.java b/runescape-client/src/main/java/PlatformInfo.java index 149d39c379..f742e4ec75 100644 --- a/runescape-client/src/main/java/PlatformInfo.java +++ b/runescape-client/src/main/java/PlatformInfo.java @@ -4,202 +4,188 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lj") +@ObfuscatedName("lx") @Implements("PlatformInfo") public class PlatformInfo extends Node { - @ObfuscatedName("aw") - @ObfuscatedGetter( - intValue = -319995609 - ) - int field3917; - @ObfuscatedName("ak") - boolean field3909; - @ObfuscatedName("aa") - @ObfuscatedGetter( - intValue = 689449567 - ) - int field3904; - @ObfuscatedName("ab") - @ObfuscatedGetter( - intValue = 508729537 - ) - int field3911; - @ObfuscatedName("ar") - @ObfuscatedGetter( - intValue = -42607037 - ) - int field3912; - @ObfuscatedName("av") - @ObfuscatedGetter( - intValue = -624534927 - ) - int field3907; - @ObfuscatedName("aq") - @ObfuscatedGetter( - intValue = 1257010089 - ) - int field3914; - @ObfuscatedName("ac") - boolean field3915; - @ObfuscatedName("az") - @ObfuscatedGetter( - intValue = 1031009357 - ) - int field3916; - @ObfuscatedName("at") - @ObfuscatedGetter( - intValue = 1719417791 - ) - int field3910; - @ObfuscatedName("aj") - @ObfuscatedGetter( - intValue = -62226837 - ) - int field3930; - @ObfuscatedName("ap") - @ObfuscatedGetter( - intValue = 364104521 - ) - int field3906; - @ObfuscatedName("an") - String field3920; - @ObfuscatedName("al") - String field3921; - @ObfuscatedName("ay") - String field3913; - @ObfuscatedName("ax") - String field3923; - @ObfuscatedName("au") - @ObfuscatedGetter( - intValue = -1064226031 - ) - int field3924; - @ObfuscatedName("as") - @ObfuscatedGetter( - intValue = 1565693073 - ) - int field3925; @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = 1111257325 + intValue = -156500797 ) - int field3919; - @ObfuscatedName("bi") + int field3910; + @ObfuscatedName("aq") + boolean field3900; + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -1835106139 + intValue = -2023762537 + ) + int field3912; + @ObfuscatedName("an") + @ObfuscatedGetter( + intValue = -1361201989 + ) + int field3928; + @ObfuscatedName("ar") + @ObfuscatedGetter( + intValue = 582354969 + ) + int field3914; + @ObfuscatedName("az") + @ObfuscatedGetter( + intValue = -1969903695 + ) + int field3916; + @ObfuscatedName("ay") + @ObfuscatedGetter( + intValue = 885412383 + ) + int field3901; + @ObfuscatedName("ag") + boolean field3919; + @ObfuscatedName("ac") + @ObfuscatedGetter( + intValue = -1571360447 + ) + int field3918; + @ObfuscatedName("al") + @ObfuscatedGetter( + intValue = 1817663209 + ) + int field3929; + @ObfuscatedName("ad") + @ObfuscatedGetter( + intValue = -855226187 + ) + int field3911; + @ObfuscatedName("aj") + @ObfuscatedGetter( + intValue = -180398763 + ) + int field3921; + @ObfuscatedName("ax") + String field3904; + @ObfuscatedName("at") + String field3923; + @ObfuscatedName("af") + String field3924; + @ObfuscatedName("ap") + String field3917; + @ObfuscatedName("ai") + @ObfuscatedGetter( + intValue = 35861657 + ) + int field3926; + @ObfuscatedName("am") + @ObfuscatedGetter( + intValue = -1513302613 ) int field3927; - @ObfuscatedName("bo") - String field3928; - @ObfuscatedName("bx") - String field3929; - @ObfuscatedName("bu") - int[] field3902; - @ObfuscatedName("bd") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -1505377963 + intValue = -225133915 ) - int field3931; - @ObfuscatedName("bn") - String field3932; + int field3922; + @ObfuscatedName("bj") + @ObfuscatedGetter( + intValue = -1211564883 + ) + int field3902; + @ObfuscatedName("bg") + String field3930; + @ObfuscatedName("bw") + String field3931; + @ObfuscatedName("bk") + int[] field3925; + @ObfuscatedName("bl") + @ObfuscatedGetter( + intValue = -2107690227 + ) + int field3933; + @ObfuscatedName("bq") + String field3934; 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.field3902 = new int[3]; - this.field3917 = var1; - this.field3909 = var2; - this.field3904 = var3; - this.field3911 = var4; - this.field3912 = var5; - this.field3907 = var6; - this.field3914 = var7; - this.field3915 = var8; - this.field3916 = var9; - this.field3910 = var10; - this.field3930 = var11; - this.field3906 = var12; - this.field3920 = var13; - this.field3921 = var14; - this.field3913 = var15; - this.field3923 = var16; - this.field3924 = var17; - this.field3925 = var18; - this.field3919 = var19; - this.field3927 = var20; - this.field3928 = var21; - this.field3929 = var22; - this.field3902 = var23; - this.field3931 = var24; - this.field3932 = var25; - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(Lkg;B)V", - garbageValue = "0" - ) - @Export("write") - public void write(Buffer var1) { - var1.writeByte(8); - var1.writeByte(this.field3917); - var1.writeByte(this.field3909 ? 1 : 0); - var1.writeShort(this.field3904); - var1.writeByte(this.field3911); - var1.writeByte(this.field3912); - var1.writeByte(this.field3907); - var1.writeByte(this.field3914); - var1.writeByte(this.field3915 ? 1 : 0); - var1.writeShort(this.field3916); - var1.writeByte(this.field3910); - var1.writeMedium(this.field3930); - var1.writeShort(this.field3906); - var1.writeStringCp1252NullCircumfixed(this.field3920); - var1.writeStringCp1252NullCircumfixed(this.field3921); - var1.writeStringCp1252NullCircumfixed(this.field3913); - var1.writeStringCp1252NullCircumfixed(this.field3923); - var1.writeByte(this.field3925); - var1.writeShort(this.field3924); - var1.writeStringCp1252NullCircumfixed(this.field3928); - var1.writeStringCp1252NullCircumfixed(this.field3929); - var1.writeByte(this.field3919); - var1.writeByte(this.field3927); - - for (int var2 = 0; var2 < this.field3902.length; ++var2) { - var1.writeInt(this.field3902[var2]); - } - - var1.writeInt(this.field3931); - var1.writeStringCp1252NullCircumfixed(this.field3932); + this.field3925 = new int[3]; + this.field3910 = var1; + this.field3900 = var2; + this.field3912 = var3; + this.field3928 = var4; + this.field3914 = var5; + this.field3916 = var6; + this.field3901 = var7; + this.field3919 = var8; + this.field3918 = var9; + this.field3929 = var10; + this.field3911 = var11; + this.field3921 = var12; + this.field3904 = var13; + this.field3923 = var14; + this.field3924 = var15; + this.field3917 = var16; + this.field3926 = var17; + this.field3927 = var18; + this.field3922 = var19; + this.field3902 = var20; + this.field3930 = var21; + this.field3931 = var22; + this.field3925 = var23; + this.field3933 = var24; + this.field3934 = var25; } @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "(Lkq;I)V", + garbageValue = "273462814" + ) + @Export("write") + public void write(Buffer var1) { + var1.writeByte(8); + var1.writeByte(this.field3910); + var1.writeByte(this.field3900 ? 1 : 0); + var1.writeShort(this.field3912); + var1.writeByte(this.field3928); + var1.writeByte(this.field3914); + var1.writeByte(this.field3916); + var1.writeByte(this.field3901); + var1.writeByte(this.field3919 ? 1 : 0); + var1.writeShort(this.field3918); + var1.writeByte(this.field3929); + var1.writeMedium(this.field3911); + var1.writeShort(this.field3921); + var1.writeStringCp1252NullCircumfixed(this.field3904); + var1.writeStringCp1252NullCircumfixed(this.field3923); + var1.writeStringCp1252NullCircumfixed(this.field3924); + var1.writeStringCp1252NullCircumfixed(this.field3917); + var1.writeByte(this.field3927); + var1.writeShort(this.field3926); + var1.writeStringCp1252NullCircumfixed(this.field3930); + var1.writeStringCp1252NullCircumfixed(this.field3931); + var1.writeByte(this.field3922); + var1.writeByte(this.field3902); + + for (int var2 = 0; var2 < this.field3925.length; ++var2) { + var1.writeInt(this.field3925[var2]); + } + + var1.writeInt(this.field3933); + var1.writeStringCp1252NullCircumfixed(this.field3934); + } + + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1694197282" + garbageValue = "19008325" ) @Export("size") public int size() { byte var1 = 39; - String var4 = this.field3920; - int var3 = var4.length() + 2; - int var23 = var3 + var1; - String var7 = this.field3921; - int var6 = var7.length() + 2; - var23 += var6; - String var10 = this.field3913; - int var9 = var10.length() + 2; - var23 += var9; - String var13 = this.field3923; - int var12 = var13.length() + 2; - var23 += var12; - String var16 = this.field3928; - int var15 = var16.length() + 2; - var23 += var15; - String var19 = this.field3929; - int var18 = var19.length() + 2; - var23 += var18; - String var22 = this.field3932; - int var21 = var22.length() + 2; - var23 += var21; - return var23; + int var2 = var1 + class290.method5375(this.field3904); + var2 += class290.method5375(this.field3923); + var2 += class290.method5375(this.field3924); + var2 += class290.method5375(this.field3917); + var2 += class290.method5375(this.field3930); + var2 += class290.method5375(this.field3931); + var2 += class290.method5375(this.field3934); + return var2; } } diff --git a/runescape-client/src/main/java/PlatformInfoProvider.java b/runescape-client/src/main/java/PlatformInfoProvider.java index 2b9b3eeb1c..7a6afddfcf 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("lh") +@ObfuscatedName("ly") @Implements("PlatformInfoProvider") public interface PlatformInfoProvider { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(B)Llj;", - garbageValue = "-40" + signature = "(B)Llx;", + garbageValue = "-83" ) @Export("get") PlatformInfo get(); diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java index 69cf3fe95d..42d872d635 100644 --- a/runescape-client/src/main/java/Player.java +++ b/runescape-client/src/main/java/Player.java @@ -3,162 +3,157 @@ 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("bg") +@ObfuscatedName("bn") @Implements("Player") public final class Player extends Actor { - @ObfuscatedName("fp") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lky;" - ) - @Export("fontPlain12") - static Font fontPlain12; - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Ljb;" + signature = "Ljc;" ) @Export("username") Username username; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lhd;" + signature = "Lhh;" ) @Export("appearance") PlayerAppearance appearance; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 668256771 + intValue = 1331202431 ) @Export("headIconPk") int headIconPk; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 334440827 + intValue = -977239285 ) @Export("headIconPrayer") int headIconPrayer; - @ObfuscatedName("p") + @ObfuscatedName("b") @Export("actions") String[] actions; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 274943013 + intValue = 2063784201 ) @Export("combatLevel") int combatLevel; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1410660801 + intValue = 431369415 ) @Export("skillLevel") int skillLevel; - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1809943585 + intValue = 1361668867 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 59496057 + intValue = 633706155 ) @Export("animationCycleStart") int animationCycleStart; - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1958828963 + intValue = 477981213 ) @Export("animationCycleEnd") int animationCycleEnd; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -97527251 - ) - int field623; @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 452166125 + intValue = 771140369 + ) + int field601; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 762347849 ) @Export("tileHeight2") int tileHeight2; - @ObfuscatedName("e") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1739722177 + intValue = 1786689969 ) - int field617; - @ObfuscatedName("n") + int field603; + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Ldf;" + signature = "Ldw;" ) @Export("model0") Model model0; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -2105768533 + intValue = 1075037713 ) - int field618; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -845670421 - ) - int field620; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = -460372187 - ) - int field621; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 73836445 - ) - int field622; - @ObfuscatedName("s") - @Export("isUnanimated") - boolean isUnanimated; + int field605; @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1020180477 + intValue = 1536061617 + ) + int field606; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -103180295 + ) + int field607; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -1426578557 + ) + int field608; + @ObfuscatedName("u") + @Export("isUnanimated") + boolean isUnanimated; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 897057987 ) @Export("team") int team; - @ObfuscatedName("m") + @ObfuscatedName("h") @Export("isHidden") boolean isHidden; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1146584027 + intValue = 617269877 ) @Export("plane") int plane; - @ObfuscatedName("q") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 37577883 + intValue = 1252308221 ) @Export("index") int index; - @ObfuscatedName("l") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "Lja;" + signature = "Ljf;" ) @Export("isFriendTriBool") TriBool isFriendTriBool; - @ObfuscatedName("j") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lja;" + signature = "Ljf;" ) @Export("isInClanChat") TriBool isInClanChat; - @ObfuscatedName("af") - boolean field630; - @ObfuscatedName("ad") + @ObfuscatedName("aa") + boolean field616; + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -1213220739 + intValue = -1337085729 ) @Export("tileX") int tileX; - @ObfuscatedName("am") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = -516890813 + intValue = 469043067 ) @Export("tileY") int tileY; @@ -181,13 +176,13 @@ public final class Player extends Actor { this.isHidden = false; this.isFriendTriBool = TriBool.TriBool_unknown; this.isInClanChat = TriBool.TriBool_unknown; - this.field630 = false; + this.field616 = false; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Lkg;I)V", - garbageValue = "-1611293437" + signature = "(Lkq;B)V", + garbageValue = "-42" ) @Export("read") final void read(Buffer var1) { @@ -214,7 +209,7 @@ public final class Player extends Actor { } if (var4[var5] >= 512) { - int var8 = Interpreter.ItemDefinition_get(var4[var5] - 512).team; + int var8 = PacketBufferNode.ItemDefinition_get(var4[var5] - 512).team; if (var8 != 0) { this.team = var8; } @@ -226,7 +221,7 @@ public final class Player extends Actor { for (var6 = 0; var6 < 5; ++var6) { var7 = var1.readUnsignedByte(); - if (var7 < 0 || var7 >= ArchiveLoader.field533[var6].length) { + if (var7 < 0 || var7 >= WorldMapSection1.field269[var6].length) { var7 = 0; } @@ -269,10 +264,10 @@ public final class Player extends Actor { super.runSequence = -1; } - this.username = new Username(var1.readStringCp1252NullTerminated(), WorldMapLabelSize.loginType); + this.username = new Username(var1.readStringCp1252NullTerminated(), class188.loginType); this.clearIsFriend(); this.clearIsInClanChat(); - if (this == class215.localPlayer) { + if (this == Message.localPlayer) { RunException.localPlayerName = this.username.getName(); } @@ -290,10 +285,10 @@ public final class Player extends Actor { this.appearance.update(var4, var9, var2 == 1, var3); } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "57" + signature = "(I)Z", + garbageValue = "-2131627106" ) @Export("isFriend") boolean isFriend() { @@ -304,30 +299,30 @@ public final class Player extends Actor { return this.isFriendTriBool == TriBool.TriBool_true; } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "1" + signature = "(I)V", + garbageValue = "1114296910" ) @Export("clearIsFriend") void clearIsFriend() { this.isFriendTriBool = TriBool.TriBool_unknown; } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1426797155" + garbageValue = "-1782009211" ) @Export("checkIsFriend") void checkIsFriend() { - this.isFriendTriBool = VertexNormal.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isFriendTriBool = Message.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "1498117074" + signature = "(B)Z", + garbageValue = "60" ) @Export("isClanMember") boolean isClanMember() { @@ -338,48 +333,48 @@ public final class Player extends Actor { return this.isInClanChat == TriBool.TriBool_true; } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1542877638" + signature = "(B)V", + garbageValue = "66" ) @Export("clearIsInClanChat") void clearIsInClanChat() { this.isInClanChat = TriBool.TriBool_unknown; } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "14697600" + garbageValue = "-188049254" ) @Export("updateIsInClanChat") void updateIsInClanChat() { - this.isInClanChat = InterfaceParent.clanChat != null && InterfaceParent.clanChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isInClanChat = Calendar.clanChat != null && Calendar.clanChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "86" + signature = "(I)I", + garbageValue = "-416425004" ) @Export("transformedSize") int transformedSize() { - return this.appearance != null && this.appearance.npcTransformId != -1 ? VarcInt.getNpcDefinition(this.appearance.npcTransformId).size : 1; + return this.appearance != null && this.appearance.npcTransformId != -1 ? AbstractUserComparator.getNpcDefinition(this.appearance.npcTransformId).size : 1; } - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)Ldf;", - garbageValue = "-174129419" + signature = "(I)Ldw;", + garbageValue = "822221372" ) @Export("getModel") protected final Model getModel() { if (this.appearance == null) { return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? GrandExchangeOfferAgeComparator.SequenceDefinition_get(super.sequence) : null; - SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.readySequence == super.movementSequence && var1 != null ? null : GrandExchangeOfferAgeComparator.SequenceDefinition_get(super.movementSequence); + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? WorldMapSection0.SequenceDefinition_get(super.sequence) : null; + SequenceDefinition var2 = super.movementSequence != -1 && !this.isUnanimated && (super.movementSequence != super.readySequence || var1 == null) ? WorldMapSection0.SequenceDefinition_get(super.movementSequence) : null; Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); if (var3 == null) { return null; @@ -389,9 +384,9 @@ public final class Player extends Actor { Model var4; Model[] var5; if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { - var4 = WorldMapRegion.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); + var4 = ClientPacket.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); if (var4 != null) { - var4.offsetBy(0, -super.field996, 0); + var4.offsetBy(0, -super.field963, 0); var5 = new Model[]{var3, var4}; var3 = new Model(var5, 2); } @@ -404,7 +399,7 @@ public final class Player extends Actor { if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { var4 = this.model0; - var4.offsetBy(this.field623 * 4096 - super.x, this.tileHeight2 - this.tileHeight, this.field617 * 4096 - super.y); + var4.offsetBy(this.field601 * 4096 - super.x, this.tileHeight2 - this.tileHeight, this.field603 * 4096 - super.y); if (super.orientation == 512) { var4.rotateY90Ccw(); var4.rotateY90Ccw(); @@ -429,7 +424,7 @@ public final class Player extends Actor { var4.rotateY90Ccw(); } - var4.offsetBy(super.x - this.field623 * 4096, this.tileHeight - this.tileHeight2, super.y - this.field617 * 4096); + var4.offsetBy(super.x - this.field601 * 4096, this.tileHeight - this.tileHeight2, super.y - this.field603 * 4096); } } @@ -439,17 +434,17 @@ public final class Player extends Actor { } } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(IIBI)V", - garbageValue = "968915391" + garbageValue = "1025899356" ) - final void method1255(int var1, int var2, byte var3) { - if (super.sequence != -1 && GrandExchangeOfferAgeComparator.SequenceDefinition_get(super.sequence).field3515 == 1) { + final void method1261(int var1, int var2, byte var3) { + if (super.sequence != -1 && WorldMapSection0.SequenceDefinition_get(super.sequence).field3493 == 1) { super.sequence = -1; } - super.field965 = -1; + super.field960 = -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) { @@ -458,16 +453,478 @@ public final class Player extends Actor { 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 var8 = ParamDefinition.method4612(var5, var6, this.transformedSize(), WorldMapIcon_1.method321(var1, var2), Client.collisionMaps[this.plane], true, Client.field916, Client.field862); - if (var8 >= 1) { - for (int var9 = 0; var9 < var8 - 1; ++var9) { - var4.method1250(Client.field916[var9], Client.field862[var9], (byte)2); + int var9 = this.transformedSize(); + Client.field902.approxDestinationX = var1; + Client.field902.approxDestinationY = var2; + Client.field902.approxDestinationSizeX = 1; + Client.field902.approxDestinationSizeY = 1; + class65 var10 = Client.field902; + class65 var11 = var10; + CollisionMap var12 = Client.collisionMaps[this.plane]; + int[] var13 = Client.field903; + int[] var14 = Client.field730; + int var15 = 0; + + label733: + while (true) { + int var16; + if (var15 >= 128) { + int var17; + int var18; + byte var20; + int var21; + int var22; + int var24; + int var26; + int var27; + int var28; + int var29; + boolean var35; + int var37; + int var38; + int var40; + if (var9 == 1) { + var35 = class14.method158(var5, var6, var10, var12); + } else { + byte var19; + byte var23; + int[][] var34; + boolean var36; + if (var9 == 2) { + var17 = var5; + var18 = var6; + var19 = 64; + var20 = 64; + var21 = var5 - var19; + var22 = var6 - var20; + class173.directions[var19][var20] = 99; + class173.distances[var19][var20] = 0; + var23 = 0; + var24 = 0; + class173.bufferX[var23] = var5; + var40 = var23 + 1; + class173.bufferY[var23] = var6; + var34 = var12.flags; + + while (true) { + if (var24 == var40) { + class268.field3524 = var17; + class173.field2072 = var18; + var36 = false; + break; + } + + var17 = class173.bufferX[var24]; + var18 = class173.bufferY[var24]; + var24 = var24 + 1 & 4095; + var37 = var17 - var21; + var38 = var18 - var22; + var26 = var17 - var12.xInset; + var27 = var18 - var12.yInset; + if (var11.hasArrived(2, var17, var18, var12)) { + class268.field3524 = var17; + class173.field2072 = var18; + var36 = true; + break; + } + + var28 = class173.distances[var37][var38] + 1; + if (var37 > 0 && class173.directions[var37 - 1][var38] == 0 && (var34[var26 - 1][var27] & 19136782) == 0 && (var34[var26 - 1][var27 + 1] & 19136824) == 0) { + class173.bufferX[var40] = var17 - 1; + class173.bufferY[var40] = var18; + var40 = var40 + 1 & 4095; + class173.directions[var37 - 1][var38] = 2; + class173.distances[var37 - 1][var38] = var28; + } + + if (var37 < 126 && class173.directions[var37 + 1][var38] == 0 && (var34[var26 + 2][var27] & 19136899) == 0 && (var34[var26 + 2][var27 + 1] & 19136992) == 0) { + class173.bufferX[var40] = var17 + 1; + class173.bufferY[var40] = var18; + var40 = var40 + 1 & 4095; + class173.directions[var37 + 1][var38] = 8; + class173.distances[var37 + 1][var38] = var28; + } + + if (var38 > 0 && class173.directions[var37][var38 - 1] == 0 && (var34[var26][var27 - 1] & 19136782) == 0 && (var34[var26 + 1][var27 - 1] & 19136899) == 0) { + class173.bufferX[var40] = var17; + class173.bufferY[var40] = var18 - 1; + var40 = var40 + 1 & 4095; + class173.directions[var37][var38 - 1] = 1; + class173.distances[var37][var38 - 1] = var28; + } + + if (var38 < 126 && class173.directions[var37][var38 + 1] == 0 && (var34[var26][var27 + 2] & 19136824) == 0 && (var34[var26 + 1][var27 + 2] & 19136992) == 0) { + class173.bufferX[var40] = var17; + class173.bufferY[var40] = var18 + 1; + var40 = var40 + 1 & 4095; + class173.directions[var37][var38 + 1] = 4; + class173.distances[var37][var38 + 1] = var28; + } + + if (var37 > 0 && var38 > 0 && class173.directions[var37 - 1][var38 - 1] == 0 && (var34[var26 - 1][var27] & 19136830) == 0 && (var34[var26 - 1][var27 - 1] & 19136782) == 0 && (var34[var26][var27 - 1] & 19136911) == 0) { + class173.bufferX[var40] = var17 - 1; + class173.bufferY[var40] = var18 - 1; + var40 = var40 + 1 & 4095; + class173.directions[var37 - 1][var38 - 1] = 3; + class173.distances[var37 - 1][var38 - 1] = var28; + } + + if (var37 < 126 && var38 > 0 && class173.directions[var37 + 1][var38 - 1] == 0 && (var34[var26 + 1][var27 - 1] & 19136911) == 0 && (var34[var26 + 2][var27 - 1] & 19136899) == 0 && (var34[var26 + 2][var27] & 19136995) == 0) { + class173.bufferX[var40] = var17 + 1; + class173.bufferY[var40] = var18 - 1; + var40 = var40 + 1 & 4095; + class173.directions[var37 + 1][var38 - 1] = 9; + class173.distances[var37 + 1][var38 - 1] = var28; + } + + if (var37 > 0 && var38 < 126 && class173.directions[var37 - 1][var38 + 1] == 0 && (var34[var26 - 1][var27 + 1] & 19136830) == 0 && (var34[var26 - 1][var27 + 2] & 19136824) == 0 && (var34[var26][var27 + 2] & 19137016) == 0) { + class173.bufferX[var40] = var17 - 1; + class173.bufferY[var40] = var18 + 1; + var40 = var40 + 1 & 4095; + class173.directions[var37 - 1][var38 + 1] = 6; + class173.distances[var37 - 1][var38 + 1] = var28; + } + + if (var37 < 126 && var38 < 126 && class173.directions[var37 + 1][var38 + 1] == 0 && (var34[var26 + 1][var27 + 2] & 19137016) == 0 && (var34[var26 + 2][var27 + 2] & 19136992) == 0 && (var34[var26 + 2][var27 + 1] & 19136995) == 0) { + class173.bufferX[var40] = var17 + 1; + class173.bufferY[var40] = var18 + 1; + var40 = var40 + 1 & 4095; + class173.directions[var37 + 1][var38 + 1] = 12; + class173.distances[var37 + 1][var38 + 1] = var28; + } + } + + var35 = var36; + } else { + var17 = var5; + var18 = var6; + var19 = 64; + var20 = 64; + var21 = var5 - var19; + var22 = var6 - var20; + class173.directions[var19][var20] = 99; + class173.distances[var19][var20] = 0; + var23 = 0; + var24 = 0; + class173.bufferX[var23] = var5; + var40 = var23 + 1; + class173.bufferY[var23] = var6; + var34 = var12.flags; + + label711: + while (true) { + label709: + while (true) { + do { + do { + do { + label686: + do { + if (var24 == var40) { + class268.field3524 = var17; + class173.field2072 = var18; + var36 = false; + break label711; + } + + var17 = class173.bufferX[var24]; + var18 = class173.bufferY[var24]; + var24 = var24 + 1 & 4095; + var37 = var17 - var21; + var38 = var18 - var22; + var26 = var17 - var12.xInset; + var27 = var18 - var12.yInset; + if (var11.hasArrived(var9, var17, var18, var12)) { + class268.field3524 = var17; + class173.field2072 = var18; + var36 = true; + break label711; + } + + var28 = class173.distances[var37][var38] + 1; + if (var37 > 0 && class173.directions[var37 - 1][var38] == 0 && (var34[var26 - 1][var27] & 19136782) == 0 && (var34[var26 - 1][var27 + var9 - 1] & 19136824) == 0) { + var29 = 1; + + while (true) { + if (var29 >= var9 - 1) { + class173.bufferX[var40] = var17 - 1; + class173.bufferY[var40] = var18; + var40 = var40 + 1 & 4095; + class173.directions[var37 - 1][var38] = 2; + class173.distances[var37 - 1][var38] = var28; + break; + } + + if ((var34[var26 - 1][var29 + var27] & 19136830) != 0) { + break; + } + + ++var29; + } + } + + if (var37 < 128 - var9 && class173.directions[var37 + 1][var38] == 0 && (var34[var9 + var26][var27] & 19136899) == 0 && (var34[var9 + var26][var9 + var27 - 1] & 19136992) == 0) { + var29 = 1; + + while (true) { + if (var29 >= var9 - 1) { + class173.bufferX[var40] = var17 + 1; + class173.bufferY[var40] = var18; + var40 = var40 + 1 & 4095; + class173.directions[var37 + 1][var38] = 8; + class173.distances[var37 + 1][var38] = var28; + break; + } + + if ((var34[var9 + var26][var29 + var27] & 19136995) != 0) { + break; + } + + ++var29; + } + } + + if (var38 > 0 && class173.directions[var37][var38 - 1] == 0 && (var34[var26][var27 - 1] & 19136782) == 0 && (var34[var26 + var9 - 1][var27 - 1] & 19136899) == 0) { + var29 = 1; + + while (true) { + if (var29 >= var9 - 1) { + class173.bufferX[var40] = var17; + class173.bufferY[var40] = var18 - 1; + var40 = var40 + 1 & 4095; + class173.directions[var37][var38 - 1] = 1; + class173.distances[var37][var38 - 1] = var28; + break; + } + + if ((var34[var29 + var26][var27 - 1] & 19136911) != 0) { + break; + } + + ++var29; + } + } + + if (var38 < 128 - var9 && class173.directions[var37][var38 + 1] == 0 && (var34[var26][var9 + var27] & 19136824) == 0 && (var34[var9 + var26 - 1][var9 + var27] & 19136992) == 0) { + var29 = 1; + + while (true) { + if (var29 >= var9 - 1) { + class173.bufferX[var40] = var17; + class173.bufferY[var40] = var18 + 1; + var40 = var40 + 1 & 4095; + class173.directions[var37][var38 + 1] = 4; + class173.distances[var37][var38 + 1] = var28; + break; + } + + if ((var34[var26 + var29][var9 + var27] & 19137016) != 0) { + break; + } + + ++var29; + } + } + + if (var37 > 0 && var38 > 0 && class173.directions[var37 - 1][var38 - 1] == 0 && (var34[var26 - 1][var27 - 1] & 19136782) == 0) { + var29 = 1; + + while (true) { + if (var29 >= var9) { + class173.bufferX[var40] = var17 - 1; + class173.bufferY[var40] = var18 - 1; + var40 = var40 + 1 & 4095; + class173.directions[var37 - 1][var38 - 1] = 3; + class173.distances[var37 - 1][var38 - 1] = var28; + break; + } + + if ((var34[var26 - 1][var29 + (var27 - 1)] & 19136830) != 0 || (var34[var29 + (var26 - 1)][var27 - 1] & 19136911) != 0) { + break; + } + + ++var29; + } + } + + if (var37 < 128 - var9 && var38 > 0 && class173.directions[var37 + 1][var38 - 1] == 0 && (var34[var26 + var9][var27 - 1] & 19136899) == 0) { + var29 = 1; + + while (true) { + if (var29 >= var9) { + class173.bufferX[var40] = var17 + 1; + class173.bufferY[var40] = var18 - 1; + var40 = var40 + 1 & 4095; + class173.directions[var37 + 1][var38 - 1] = 9; + class173.distances[var37 + 1][var38 - 1] = var28; + break; + } + + if ((var34[var26 + var9][var29 + (var27 - 1)] & 19136995) != 0 || (var34[var29 + var26][var27 - 1] & 19136911) != 0) { + break; + } + + ++var29; + } + } + + if (var37 > 0 && var38 < 128 - var9 && class173.directions[var37 - 1][var38 + 1] == 0 && (var34[var26 - 1][var9 + var27] & 19136824) == 0) { + for (var29 = 1; var29 < var9; ++var29) { + if ((var34[var26 - 1][var27 + var29] & 19136830) != 0 || (var34[var29 + (var26 - 1)][var27 + var9] & 19137016) != 0) { + continue label686; + } + } + + class173.bufferX[var40] = var17 - 1; + class173.bufferY[var40] = var18 + 1; + var40 = var40 + 1 & 4095; + class173.directions[var37 - 1][var38 + 1] = 6; + class173.distances[var37 - 1][var38 + 1] = var28; + } + } while(var37 >= 128 - var9); + } while(var38 >= 128 - var9); + } while(class173.directions[var37 + 1][var38 + 1] != 0); + } while((var34[var9 + var26][var9 + var27] & 19136992) != 0); + + for (var29 = 1; var29 < var9; ++var29) { + if ((var34[var29 + var26][var9 + var27] & 19137016) != 0 || (var34[var26 + var9][var27 + var29] & 19136995) != 0) { + continue label709; + } + } + + class173.bufferX[var40] = var17 + 1; + class173.bufferY[var40] = var18 + 1; + var40 = var40 + 1 & 4095; + class173.directions[var37 + 1][var38 + 1] = 12; + class173.distances[var37 + 1][var38 + 1] = var28; + } + } + + var35 = var36; + } + } + + int var8; + label774: { + var16 = var5 - 64; + var17 = var6 - 64; + var18 = class268.field3524; + var37 = class173.field2072; + if (!var35) { + var38 = Integer.MAX_VALUE; + var21 = Integer.MAX_VALUE; + byte var39 = 10; + var40 = var11.approxDestinationX; + var24 = var11.approxDestinationY; + int var25 = var11.approxDestinationSizeX; + var26 = var11.approxDestinationSizeY; + + for (var27 = var40 - var39; var27 <= var39 + var40; ++var27) { + for (var28 = var24 - var39; var28 <= var39 + var24; ++var28) { + var29 = var27 - var16; + int var30 = var28 - var17; + if (var29 >= 0 && var30 >= 0 && var29 < 128 && var30 < 128 && class173.distances[var29][var30] < 100) { + int var31 = 0; + if (var27 < var40) { + var31 = var40 - var27; + } else if (var27 > var40 + var25 - 1) { + var31 = var27 - (var25 + var40 - 1); + } + + int var32 = 0; + if (var28 < var24) { + var32 = var24 - var28; + } else if (var28 > var24 + var26 - 1) { + var32 = var28 - (var26 + var24 - 1); + } + + int var33 = var31 * var31 + var32 * var32; + if (var33 < var38 || var38 == var33 && class173.distances[var29][var30] < var21) { + var38 = var33; + var21 = class173.distances[var29][var30]; + var18 = var27; + var37 = var28; + } + } + } + } + + if (var38 == Integer.MAX_VALUE) { + var8 = -1; + break label774; + } + } + + if (var5 == var18 && var6 == var37) { + var8 = 0; + } else { + var20 = 0; + class173.bufferX[var20] = var18; + var38 = var20 + 1; + class173.bufferY[var20] = var37; + + for (var21 = var22 = class173.directions[var18 - var16][var37 - var17]; var5 != var18 || var6 != var37; var21 = class173.directions[var18 - var16][var37 - var17]) { + if (var22 != var21) { + var22 = var21; + class173.bufferX[var38] = var18; + class173.bufferY[var38++] = var37; + } + + if ((var21 & 2) != 0) { + ++var18; + } else if ((var21 & 8) != 0) { + --var18; + } + + if ((var21 & 1) != 0) { + ++var37; + } else if ((var21 & 4) != 0) { + --var37; + } + } + + var40 = 0; + + while (var38-- > 0) { + var13[var40] = class173.bufferX[var38]; + var14[var40++] = class173.bufferY[var38]; + if (var40 >= var13.length) { + break; + } + } + + var8 = var40; + } + } + + var15 = var8; + if (var8 < 1) { + break; + } + + var16 = 0; + + while (true) { + if (var16 >= var15 - 1) { + break label733; + } + + var4.method1246(Client.field903[var16], Client.field730[var16], (byte)2); + ++var16; + } } + + for (var16 = 0; var16 < 128; ++var16) { + class173.directions[var15][var16] = 0; + class173.distances[var15][var16] = 99999999; + } + + ++var15; } } } - this.method1250(var1, var2, var3); + this.method1246(var1, var2, var3); } else { this.resetPath(var1, var2); } @@ -477,29 +934,29 @@ public final class Player extends Actor { } - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "1311656261" + signature = "(IIB)V", + garbageValue = "16" ) @Export("resetPath") void resetPath(int var1, int var2) { super.pathLength = 0; - super.field994 = 0; - super.field976 = 0; + super.field926 = 0; + super.field980 = 0; super.pathX[0] = var1; super.pathY[0] = var2; int var3 = this.transformedSize(); super.x = var3 * 64 + super.pathX[0] * 128; - super.y = super.pathY[0] * 128 + var3 * 64; + super.y = var3 * 64 + super.pathY[0] * 128; } - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(IIBI)V", - garbageValue = "2140265482" + garbageValue = "-1970800516" ) - final void method1250(int var1, int var2, byte var3) { + final void method1246(int var1, int var2, byte var3) { if (super.pathLength < 9) { ++super.pathLength; } @@ -515,23 +972,178 @@ public final class Player extends Actor { super.pathTraversed[0] = var3; } - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-968027489" + signature = "(S)Z", + garbageValue = "3163" ) @Export("isVisible") final boolean isVisible() { return this.appearance != null; } - @ObfuscatedName("u") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Lhf;Lhf;I)V", - garbageValue = "2087560410" + signature = "(IB)Z", + garbageValue = "4" ) - public static void method1285(AbstractArchive var0, AbstractArchive var1) { - HealthBarDefinition.HealthBarDefinition_archive = var0; - HealthBarDefinition.HitSplatDefinition_spritesArchive = var1; + public static boolean method1278(int var0) { + return (var0 >> 20 & 1) != 0; + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "(IZIZB)V", + garbageValue = "91" + ) + @Export("sortWorldList") + static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { + if (class162.World_worlds != null) { + class269.doWorldSorting(0, class162.World_worlds.length - 1, var0, var1, var2, var3); + } + + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + signature = "(Lbe;Lbe;IZI)I", + garbageValue = "261221289" + ) + @Export("compareWorlds") + static int compareWorlds(World var0, World var1, int var2, boolean var3) { + if (var2 == 1) { + int var4 = var0.population; + int var5 = var1.population; + if (!var3) { + if (var4 == -1) { + var4 = 2001; + } + + if (var5 == -1) { + var5 = 2001; + } + } + + return var4 - var5; + } else if (var2 == 2) { + return var0.location - var1.location; + } else if (var2 == 3) { + if (var0.activity.equals("-")) { + if (var1.activity.equals("-")) { + return 0; + } else { + return var3 ? -1 : 1; + } + } else if (var1.activity.equals("-")) { + return var3 ? 1 : -1; + } else { + return var0.activity.compareTo(var1.activity); + } + } else if (var2 == 4) { + return var0.method1780() ? (var1.method1780() ? 0 : 1) : (var1.method1780() ? -1 : 0); + } else if (var2 == 5) { + return var0.method1782() ? (var1.method1782() ? 0 : 1) : (var1.method1782() ? -1 : 0); + } else if (var2 == 6) { + return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0); + } else if (var2 == 7) { + return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0); + } else { + return var0.id - var1.id; + } + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + signature = "(ILcu;ZI)I", + garbageValue = "400713711" + ) + static int method1277(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { + class188.Interpreter_intStackSize -= 2; + Client.field879 = (short)class40.method762(Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]); + if (Client.field879 <= 0) { + Client.field879 = 256; + } + + Client.field880 = (short)class40.method762(Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]); + if (Client.field880 <= 0) { + Client.field880 = 256; + } + + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { + class188.Interpreter_intStackSize -= 2; + Client.zoomHeight = (short)Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + if (Client.zoomHeight <= 0) { + Client.zoomHeight = 256; + } + + Client.zoomWidth = (short)Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + if (Client.zoomWidth <= 0) { + Client.zoomWidth = 320; + } + + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { + class188.Interpreter_intStackSize -= 4; + Client.field796 = (short)Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + if (Client.field796 <= 0) { + Client.field796 = 1; + } + + Client.field884 = (short)Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + if (Client.field884 <= 0) { + Client.field884 = 32767; + } else if (Client.field884 < Client.field796) { + Client.field884 = Client.field796; + } + + Client.field804 = (short)Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 2]; + if (Client.field804 <= 0) { + Client.field804 = 1; + } + + Client.field886 = (short)Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 3]; + if (Client.field886 <= 0) { + Client.field886 = 32767; + } else if (Client.field886 < Client.field804) { + Client.field886 = Client.field804; + } + + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { + if (Client.viewportWidget != null) { + Frames.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.viewportWidth; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.viewportHeight; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; + } + + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.zoomHeight; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.zoomWidth; + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.method1740(Client.field879); + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.method1740(Client.field880); + return 1; + } else if (var0 == 6220) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 6221) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 6222) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = GrandExchangeOfferTotalQuantityComparator.canvasWidth; + return 1; + } else if (var0 == 6223) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = AttackOption.canvasHeight; + return 1; + } else { + return 2; + } } } diff --git a/runescape-client/src/main/java/PlayerAppearance.java b/runescape-client/src/main/java/PlayerAppearance.java index dfaab89733..eb15fddccb 100644 --- a/runescape-client/src/main/java/PlayerAppearance.java +++ b/runescape-client/src/main/java/PlayerAppearance.java @@ -4,60 +4,61 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hd") +@ObfuscatedName("hh") @Implements("PlayerAppearance") public class PlayerAppearance { - @ObfuscatedName("h") - public static short[] field2548; - @ObfuscatedName("w") - public static short[] field2542; - @ObfuscatedName("k") + @ObfuscatedName("e") + public static short[] field2525; + @ObfuscatedName("c") @Export("equipmentIndices") static final int[] equipmentIndices; - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lef;" + signature = "Leb;" ) @Export("PlayerAppearance_cachedModels") static EvictingDualNodeHashTable PlayerAppearance_cachedModels; - @ObfuscatedName("eo") - static int[] field2552; - @ObfuscatedName("u") + @ObfuscatedName("ge") + @ObfuscatedGetter( + intValue = 699213191 + ) + static int field2520; + @ObfuscatedName("f") @Export("equipment") int[] equipment; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("bodyColors") int[] bodyColors; - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("isFemale") public boolean isFemale; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1659743431 + intValue = -1174257501 ) @Export("npcTransformId") public int npcTransformId; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedGetter( - longValue = 8570520165784208047L + longValue = -2597773278271595335L ) @Export("hash") long hash; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedGetter( - longValue = -3088053679670010611L + longValue = 2966991994388499477L ) - long field2546; + long field2527; static { equipmentIndices = new int[]{8, 11, 4, 6, 9, 7, 10}; PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(260); } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "([I[IZII)V", - garbageValue = "-1744492323" + garbageValue = "602057306" ) @Export("update") public void update(int[] var1, int[] var2, boolean var3, int var4) { @@ -65,9 +66,9 @@ public class PlayerAppearance { var1 = new int[12]; for (int var5 = 0; var5 < 7; ++var5) { - for (int var6 = 0; var6 < KitDefinition.KitDefinition_fileCount; ++var6) { - KitDefinition var7 = Players.KitDefinition_get(var6); - if (var7 != null && !var7.nonSelectable && var7.bodypartID == (var3 ? 7 : 0) + var5) { + for (int var6 = 0; var6 < GrandExchangeOfferUnitPriceComparator.KitDefinition_fileCount; ++var6) { + KitDefinition var7 = class191.KitDefinition_get(var6); + if (var7 != null && !var7.nonSelectable && (var3 ? 7 : 0) + var5 == var7.bodypartID) { var1[equipmentIndices[var5]] = var6 + 256; break; } @@ -82,10 +83,10 @@ public class PlayerAppearance { this.setHash(); } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IZB)V", - garbageValue = "7" + signature = "(IZI)V", + garbageValue = "-559741299" ) @Export("changeAppearance") public void changeAppearance(int var1, boolean var2) { @@ -99,16 +100,16 @@ public class PlayerAppearance { if (!var2) { --var3; if (var3 < 0) { - var3 = KitDefinition.KitDefinition_fileCount - 1; + var3 = GrandExchangeOfferUnitPriceComparator.KitDefinition_fileCount - 1; } } else { ++var3; - if (var3 >= KitDefinition.KitDefinition_fileCount) { + if (var3 >= GrandExchangeOfferUnitPriceComparator.KitDefinition_fileCount) { var3 = 0; } } - var4 = Players.KitDefinition_get(var3); + var4 = class191.KitDefinition_get(var3); } while(var4 == null || var4.nonSelectable || var4.bodypartID != var1 + (this.isFemale ? 7 : 0)); this.equipment[equipmentIndices[var1]] = var3 + 256; @@ -117,37 +118,50 @@ public class PlayerAppearance { } } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(IZI)V", - garbageValue = "1401975523" + signature = "(IZB)V", + garbageValue = "-113" ) - public void method4068(int var1, boolean var2) { + public void method3978(int var1, boolean var2) { int var3 = this.bodyColors[var1]; + boolean var4; if (!var2) { do { --var3; if (var3 < 0) { - var3 = ArchiveLoader.field533[var1].length - 1; + var3 = WorldMapSection1.field269[var1].length - 1; } - } while(!RouteStrategy.method3638(var1, var3)); + + if (var1 == 4 && var3 >= 8) { + var4 = false; + } else { + var4 = true; + } + } while(!var4); } else { do { ++var3; - if (var3 >= ArchiveLoader.field533[var1].length) { + if (var3 >= WorldMapSection1.field269[var1].length) { var3 = 0; } - } while(!RouteStrategy.method3638(var1, var3)); + + if (var1 == 4 && var3 >= 8) { + var4 = false; + } else { + var4 = true; + } + } while(!var4); } this.bodyColors[var1] = var3; this.setHash(); } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(ZB)V", - garbageValue = "18" + garbageValue = "89" ) @Export("changeSex") public void changeSex(boolean var1) { @@ -156,10 +170,10 @@ public class PlayerAppearance { } } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Lkg;B)V", - garbageValue = "-112" + signature = "(Lkq;B)V", + garbageValue = "6" ) @Export("write") public void write(Buffer var1) { @@ -181,14 +195,13 @@ public class PlayerAppearance { } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1306042907" + garbageValue = "-479447540" ) @Export("setHash") - void setHash() - { + void setHash() { long var1 = this.hash; int var3 = this.equipment[5]; int var4 = this.equipment[9]; @@ -197,67 +210,57 @@ public class PlayerAppearance { this.hash = 0L; int var5; - for (var5 = 0; var5 < 12; ++var5) - { + for (var5 = 0; var5 < 12; ++var5) { this.hash <<= 4; - if (this.equipment[var5] >= 256) - { - this.hash += (long) (this.equipment[var5] - 256); + if (this.equipment[var5] >= 256) { + this.hash += (long)(this.equipment[var5] - 256); } } - if (this.equipment[0] >= 256) - { - this.hash += (long) (this.equipment[0] - 256 >> 4); + if (this.equipment[0] >= 256) { + this.hash += (long)(this.equipment[0] - 256 >> 4); } - if (this.equipment[1] >= 256) - { - this.hash += (long) (this.equipment[1] - 256 >> 8); + if (this.equipment[1] >= 256) { + this.hash += (long)(this.equipment[1] - 256 >> 8); } - for (var5 = 0; var5 < 5; ++var5) - { + for (var5 = 0; var5 < 5; ++var5) { this.hash <<= 3; - this.hash += (long) this.bodyColors[var5]; + this.hash += (long)this.bodyColors[var5]; } this.hash <<= 1; - this.hash += (long) (this.isFemale ? 1 : 0); + this.hash += (long)(this.isFemale ? 1 : 0); this.equipment[5] = var3; this.equipment[9] = var4; - if (0L != var1 && this.hash != var1) - { + if (var1 != 0L && this.hash != var1) { PlayerAppearance_cachedModels.remove(var1); } } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Liy;ILiy;IB)Ldf;", - garbageValue = "20" + signature = "(Liv;ILiv;II)Ldw;", + garbageValue = "-1547884581" ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { if (this.npcTransformId != -1) { - return VarcInt.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); - } else - { + return AbstractUserComparator.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); + } else { long var5 = this.hash; int[] var7 = this.equipment; - if (var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) - { + if (var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) { var7 = new int[12]; - for (int var15 = 0; var15 < 12; ++var15) - { + for (int var15 = 0; var15 < 12; ++var15) { var7[var15] = this.equipment[var15]; } - if (var1.shield >= 0) - { - var5 += (long) (var1.shield - this.equipment[5] << 40); + if (var1.shield >= 0) { + var5 += (long)(var1.shield - this.equipment[5] << 40); var7[5] = var1.shield; } @@ -274,18 +277,18 @@ public class PlayerAppearance { int var11; for (int var10 = 0; var10 < 12; ++var10) { var11 = var7[var10]; - if (var11 >= 256 && var11 < 512 && !Players.KitDefinition_get(var11 - 256).ready()) { + if (var11 >= 256 && var11 < 512 && !class191.KitDefinition_get(var11 - 256).ready()) { var9 = true; } - if (var11 >= 512 && !Interpreter.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { + if (var11 >= 512 && !PacketBufferNode.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { var9 = true; } } if (var9) { - if (this.field2546 != -1L) { - var8 = (Model)PlayerAppearance_cachedModels.get(this.field2546); + if (-1L != this.field2527) { + var8 = (Model)PlayerAppearance_cachedModels.get(this.field2527); } if (var8 == null) { @@ -302,14 +305,14 @@ public class PlayerAppearance { var13 = var7[var12]; ModelData var14; if (var13 >= 256 && var13 < 512) { - var14 = Players.KitDefinition_get(var13 - 256).getModelData(); + var14 = class191.KitDefinition_get(var13 - 256).getModelData(); if (var14 != null) { var16[var11++] = var14; } } if (var13 >= 512) { - var14 = Interpreter.ItemDefinition_get(var13 - 512).method4746(this.isFemale); + var14 = PacketBufferNode.ItemDefinition_get(var13 - 512).method4703(this.isFemale); if (var14 != null) { var16[var11++] = var14; } @@ -319,18 +322,18 @@ public class PlayerAppearance { ModelData var18 = new ModelData(var16, var11); for (var13 = 0; var13 < 5; ++var13) { - if (this.bodyColors[var13] < ArchiveLoader.field533[var13].length) { - var18.recolor(field2548[var13], ArchiveLoader.field533[var13][this.bodyColors[var13]]); + if (this.bodyColors[var13] < WorldMapSection1.field269[var13].length) { + var18.recolor(field2525[var13], WorldMapSection1.field269[var13][this.bodyColors[var13]]); } - if (this.bodyColors[var13] < TileItemPile.field1537[var13].length) { - var18.recolor(field2542[var13], TileItemPile.field1537[var13][this.bodyColors[var13]]); + if (this.bodyColors[var13] < CollisionMap.field2066[var13].length) { + var18.recolor(IntHashTable.field4010[var13], CollisionMap.field2066[var13][this.bodyColors[var13]]); } } var8 = var18.toModel(64, 850, -30, -50, -30); PlayerAppearance_cachedModels.put(var8, var5); - this.field2546 = var5; + this.field2527 = var5; } } @@ -351,26 +354,26 @@ public class PlayerAppearance { } } - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)Ldq;", - garbageValue = "1920849023" + signature = "(B)Ldd;", + garbageValue = "7" ) @Export("getModelData") ModelData getModelData() { if (this.npcTransformId != -1) { - return VarcInt.getNpcDefinition(this.npcTransformId).getModelData(); + return AbstractUserComparator.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 && !Players.KitDefinition_get(var3 - 256).method4535()) { + if (var3 >= 256 && var3 < 512 && !class191.KitDefinition_get(var3 - 256).method4430()) { var1 = true; } - if (var3 >= 512 && !Interpreter.ItemDefinition_get(var3 - 512).method4754(this.isFemale)) { + if (var3 >= 512 && !PacketBufferNode.ItemDefinition_get(var3 - 512).method4692(this.isFemale)) { var1 = true; } } @@ -386,14 +389,14 @@ public class PlayerAppearance { var5 = this.equipment[var4]; ModelData var6; if (var5 >= 256 && var5 < 512) { - var6 = Players.KitDefinition_get(var5 - 256).getKitDefinitionModels(); + var6 = class191.KitDefinition_get(var5 - 256).getKitDefinitionModels(); if (var6 != null) { var7[var3++] = var6; } } if (var5 >= 512) { - var6 = Interpreter.ItemDefinition_get(var5 - 512).method4755(this.isFemale); + var6 = PacketBufferNode.ItemDefinition_get(var5 - 512).method4661(this.isFemale); if (var6 != null) { var7[var3++] = var6; } @@ -403,12 +406,12 @@ public class PlayerAppearance { ModelData var8 = new ModelData(var7, var3); for (var5 = 0; var5 < 5; ++var5) { - if (this.bodyColors[var5] < ArchiveLoader.field533[var5].length) { - var8.recolor(field2548[var5], ArchiveLoader.field533[var5][this.bodyColors[var5]]); + if (this.bodyColors[var5] < WorldMapSection1.field269[var5].length) { + var8.recolor(field2525[var5], WorldMapSection1.field269[var5][this.bodyColors[var5]]); } - if (this.bodyColors[var5] < TileItemPile.field1537[var5].length) { - var8.recolor(field2542[var5], TileItemPile.field1537[var5][this.bodyColors[var5]]); + if (this.bodyColors[var5] < CollisionMap.field2066[var5].length) { + var8.recolor(IntHashTable.field4010[var5], CollisionMap.field2066[var5][this.bodyColors[var5]]); } } @@ -417,202 +420,23 @@ public class PlayerAppearance { } } - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "-123" + garbageValue = "37" ) @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 + VarcInt.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 + AbstractUserComparator.getNpcDefinition(this.npcTransformId).id; } - @ObfuscatedName("jz") + @ObfuscatedName("kv") @ObfuscatedSignature( - signature = "(Lhl;III)V", - garbageValue = "1826770393" + signature = "(I)V", + garbageValue = "-1145606712" ) - static final void method4079(Widget var0, int var1, int var2) { - if (var0.buttonType == 1) { - WorldMapSprite.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); - } - - String var3; - if (var0.buttonType == 2 && !Client.isSpellSelected) { - var3 = LoginPacket.method3662(var0); - if (var3 != null) { - WorldMapSprite.insertMenuItemNoShift(var3, class222.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); - } - } - - if (var0.buttonType == 3) { - WorldMapSprite.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); - } - - if (var0.buttonType == 4) { - WorldMapSprite.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); - } - - if (var0.buttonType == 5) { - WorldMapSprite.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); - } - - if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { - WorldMapSprite.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); - } - - int var4; - int var17; - if (var0.type == 2) { - var17 = 0; - - for (var4 = 0; var4 < var0.height; ++var4) { - for (int var5 = 0; var5 < var0.width; ++var5) { - int var6 = (var0.paddingX + 32) * var5; - int var7 = (var0.paddingY + 32) * var4; - if (var17 < 20) { - var6 += var0.inventoryXOffsets[var17]; - var7 += var0.inventoryYOffsets[var17]; - } - - if (var1 >= var6 && var2 >= var7 && var1 < var6 + 32 && var2 < var7 + 32) { - Client.dragItemSlotDestination = var17; - FloorOverlayDefinition.field3507 = var0; - if (var0.itemIds[var17] > 0) { - label318: { - ItemDefinition var8 = Interpreter.ItemDefinition_get(var0.itemIds[var17] - 1); - boolean var9; - int var10; - if (Client.isItemSelected == 1) { - var10 = MenuAction.getWidgetClickMask(var0); - var9 = (var10 >> 30 & 1) != 0; - if (var9) { - if (var0.id != class1.selectedItemWidget || var17 != class43.selectedItemSlot) { - WorldMapSprite.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class222.colorStartTag(16748608) + var8.name, 31, var8.id, var17, var0.id); - } - break label318; - } - } - - if (Client.isSpellSelected) { - var10 = MenuAction.getWidgetClickMask(var0); - var9 = (var10 >> 30 & 1) != 0; - if (var9) { - if ((Actor.selectedSpellFlags & 16) == 16) { - WorldMapSprite.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class222.colorStartTag(16748608) + var8.name, 32, var8.id, var17, var0.id); - } - break label318; - } - } - - String[] var18 = var8.inventoryActions; - var10 = -1; - if (Client.shiftClickDrop && PendingSpawn.method1751()) { - var10 = var8.getShiftClickIndex(); - } - - int var12 = MenuAction.getWidgetClickMask(var0); - boolean var11 = (var12 >> 30 & 1) != 0; - if (var11) { - for (int var13 = 4; var13 >= 3; --var13) { - if (var13 != var10) { - WorldMapRegion.addWidgetItemMenuItem(var0, var8, var17, var13, false); - } - } - } - - Object var10000 = null; - if (class189.method3699(MenuAction.getWidgetClickMask(var0))) { - WorldMapSprite.insertMenuItemNoShift("Use", class222.colorStartTag(16748608) + var8.name, 38, var8.id, var17, var0.id); - } - - int var14 = MenuAction.getWidgetClickMask(var0); - boolean var21 = (var14 >> 30 & 1) != 0; - int var15; - if (var21) { - for (var15 = 2; var15 >= 0; --var15) { - if (var10 != var15) { - WorldMapRegion.addWidgetItemMenuItem(var0, var8, var17, var15, false); - } - } - - if (var10 >= 0) { - WorldMapRegion.addWidgetItemMenuItem(var0, var8, var17, var10, true); - } - } - - var18 = var0.itemActions; - if (var18 != null) { - for (var15 = 4; var15 >= 0; --var15) { - if (var18[var15] != null) { - byte var16 = 0; - if (var15 == 0) { - var16 = 39; - } - - if (var15 == 1) { - var16 = 40; - } - - if (var15 == 2) { - var16 = 41; - } - - if (var15 == 3) { - var16 = 42; - } - - if (var15 == 4) { - var16 = 43; - } - - WorldMapSprite.insertMenuItemNoShift(var18[var15], class222.colorStartTag(16748608) + var8.name, var16, var8.id, var17, var0.id); - } - } - } - - WorldMapSprite.insertMenuItemNoShift("Examine", class222.colorStartTag(16748608) + var8.name, 1005, var8.id, var17, var0.id); - } - } - } - - ++var17; - } - } - } - - if (var0.isIf3) { - if (Client.isSpellSelected) { - var4 = MenuAction.getWidgetClickMask(var0); - boolean var22 = (var4 >> 21 & 1) != 0; - if (var22 && (Actor.selectedSpellFlags & 32) == 32) { - WorldMapSprite.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); - } - } else { - for (var17 = 9; var17 >= 5; --var17) { - String var19 = UrlRequest.method3361(var0, var17); - if (var19 != null) { - WorldMapSprite.insertMenuItemNoShift(var19, var0.dataText, 1007, var17 + 1, var0.childIndex, var0.id); - } - } - - var3 = LoginPacket.method3662(var0); - if (var3 != null) { - WorldMapSprite.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); - } - - for (var4 = 4; var4 >= 0; --var4) { - String var20 = UrlRequest.method3361(var0, var4); - if (var20 != null) { - class14.insertMenuItem(var20, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.field2719); - } - } - - if (SoundCache.method2544(MenuAction.getWidgetClickMask(var0))) { - WorldMapSprite.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); - } - } - } - + static final void method4011() { + Client.field862 = Client.cycleCntr; + Projectile.ClanChat_inClanChat = true; } } diff --git a/runescape-client/src/main/java/PlayerType.java b/runescape-client/src/main/java/PlayerType.java index e529f18bd1..e2730f4dc1 100644 --- a/runescape-client/src/main/java/PlayerType.java +++ b/runescape-client/src/main/java/PlayerType.java @@ -4,62 +4,62 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hb") +@ObfuscatedName("hp") @Implements("PlayerType") public enum PlayerType implements Enumerated { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lhb;" + signature = "Lhp;" ) @Export("PlayerType_normal") PlayerType_normal(0, -1, true, false, true), - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lhb;" + signature = "Lhp;" ) @Export("PlayerType_playerModerator") PlayerType_playerModerator(1, 0, true, true, true), - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lhb;" + signature = "Lhp;" ) @Export("PlayerType_jagexModerator") PlayerType_jagexModerator(2, 1, true, true, false), - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lhb;" + signature = "Lhp;" ) @Export("PlayerType_ironman") PlayerType_ironman(3, 2, false, false, true), - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lhb;" + signature = "Lhp;" ) @Export("PlayerType_ultimateIronman") PlayerType_ultimateIronman(4, 3, false, false, true), - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "Lhb;" + signature = "Lhp;" ) @Export("PlayerType_hardcoreIronman") PlayerType_hardcoreIronman(5, 10, false, false, true); - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 519677779 + intValue = 1619956353 ) @Export("id") final int id; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 2036327739 + intValue = -441584621 ) @Export("modIcon") public final int modIcon; - @ObfuscatedName("w") + @ObfuscatedName("a") @Export("isPrivileged") public final boolean isPrivileged; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("isUser") public final boolean isUser; @@ -70,54 +70,13 @@ public enum PlayerType implements Enumerated { this.isUser = var7; } - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "7" + garbageValue = "-57" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "(ILke;Lij;I)V", - garbageValue = "1224063547" - ) - static void method4210(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; - } - } - } - - if (var3 != null) { - var2.load(var1, var0, var3, true); - } else { - byte[] var4 = var1.read(var0); - var2.load(var1, var0, var4, true); - } - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", - garbageValue = "1655356407" - ) - public static String method4212(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; - } } diff --git a/runescape-client/src/main/java/Players.java b/runescape-client/src/main/java/Players.java index 8097daa920..531d2593f5 100644 --- a/runescape-client/src/main/java/Players.java +++ b/runescape-client/src/main/java/Players.java @@ -4,67 +4,64 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cn") +@ObfuscatedName("cx") @Implements("Players") public class Players { - @ObfuscatedName("b") - static byte[] field1246; - @ObfuscatedName("g") - static byte[] field1247; - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "[Lkg;" - ) - static Buffer[] field1248; + @ObfuscatedName("y") + static byte[] field1230; + @ObfuscatedName("w") + static byte[] field1231; @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "[Lkq;" + ) + static Buffer[] field1228; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 695859649 + intValue = 563300255 ) @Export("Players_count") static int Players_count; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("Players_indices") static int[] Players_indices; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1613986531 + intValue = -2029432023 ) @Export("Players_emptyIdxCount") static int Players_emptyIdxCount; - @ObfuscatedName("w") + @ObfuscatedName("a") @Export("Players_emptyIndices") static int[] Players_emptyIndices; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("Players_regions") static int[] Players_regions; - @ObfuscatedName("k") + @ObfuscatedName("c") @Export("Players_orientations") static int[] Players_orientations; - @ObfuscatedName("x") + @ObfuscatedName("o") @Export("Players_targetIndices") static int[] Players_targetIndices; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1909363063 + intValue = -1629507645 ) @Export("Players_pendingUpdateCount") static int Players_pendingUpdateCount; - @ObfuscatedName("e") + @ObfuscatedName("k") @Export("Players_pendingUpdateIndices") static int[] Players_pendingUpdateIndices; - @ObfuscatedName("n") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lkg;" + signature = "Lkq;" ) - static Buffer field1252; - @ObfuscatedName("ac") - @Export("null_string") - protected static String null_string; + static Buffer field1242; static { - field1246 = new byte[2048]; - field1247 = new byte[2048]; - field1248 = new Buffer[2048]; + field1230 = new byte[2048]; + field1231 = new byte[2048]; + field1228 = new Buffer[2048]; Players_count = 0; Players_indices = new int[2048]; Players_emptyIdxCount = 0; @@ -74,245 +71,53 @@ public class Players { Players_targetIndices = new int[2048]; Players_pendingUpdateCount = 0; Players_pendingUpdateIndices = new int[2048]; - field1252 = new Buffer(new byte[5000]); + field1242 = new Buffer(new byte[5000]); } @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(II)Lie;", - garbageValue = "2117062492" + signature = "([I[II)V", + garbageValue = "635493100" ) - @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 = class14.KitDefinition_archive.takeFile(3, var0); - var1 = new KitDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); + public static void method2161(int[] var0, int[] var1) { + if (var0 != null && var1 != null) { + ByteArrayPool.ByteArrayPool_alternativeSizes = var0; + Interpreter.ByteArrayPool_altSizeArrayCounts = new int[var0.length]; + ByteArrayPool.ByteArrayPool_arrays = new byte[var0.length][][]; + + for (int var2 = 0; var2 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var2) { + ByteArrayPool.ByteArrayPool_arrays[var2] = new byte[var1[var2]][]; } - KitDefinition.KitDefinition_cached.put(var1, (long)var0); - return var1; + } else { + ByteArrayPool.ByteArrayPool_alternativeSizes = null; + Interpreter.ByteArrayPool_altSizeArrayCounts = null; + ByteArrayPool.ByteArrayPool_arrays = null; } } - @ObfuscatedName("h") + @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "(Lkj;ILbg;II)V", - garbageValue = "237761948" + signature = "(II)V", + garbageValue = "98747389" ) - static final void method2167(PacketBuffer var0, int var1, Player var2, int var3) { - byte var4 = -1; - if ((var3 & 512) != 0) { - var2.field946 = var0.method5633(); - var2.field979 = var0.method5772(); - var2.field978 = var0.method5633(); - var2.field980 = var0.method5637(); - var2.field934 = var0.method5719() + Client.cycle; - var2.field982 = var0.method5640() + Client.cycle; - var2.field983 = var0.method5719(); - if (var2.field630) { - var2.field946 += var2.tileX; - var2.field979 += var2.tileY; - var2.field978 += var2.tileX; - var2.field980 += var2.tileY; - var2.pathLength = 0; - } else { - var2.field946 += var2.pathX[0]; - var2.field979 += var2.pathY[0]; - var2.field978 += var2.pathX[0]; - var2.field980 += var2.pathY[0]; - var2.pathLength = 1; - } + @Export("runWidgetOnLoadListener") + static void runWidgetOnLoadListener(int var0) { + if (var0 != -1) { + if (MusicPatch.loadInterface(var0)) { + Widget[] var1 = UserComparator7.Widget_interfaceComponents[var0]; - var2.field994 = 0; - } - - int var5; - if ((var3 & 2048) != 0) { - var2.spotAnimation = var0.method5719(); - var5 = var0.method5649(); - var2.field996 = var5 >> 16; - var2.field975 = (var5 & 65535) + Client.cycle; - var2.spotAnimationFrame = 0; - var2.spotAnimationFrameCycle = 0; - if (var2.field975 > Client.cycle) { - var2.spotAnimationFrame = -1; - } - - if (var2.spotAnimation == 65535) { - var2.spotAnimation = -1; - } - } - - if ((var3 & 1024) != 0) { - var4 = var0.readByte(); - } - - if ((var3 & 4096) != 0) { - field1247[var1] = var0.method5633(); - } - - if ((var3 & 128) != 0) { - var5 = var0.method5728(); - byte[] var6 = new byte[var5]; - Buffer var7 = new Buffer(var6); - var0.readBytes(var6, 0, var5); - field1248[var1] = var7; - var2.read(var7); - } - - if ((var3 & 256) != 0) { - for (var5 = 0; var5 < 3; ++var5) { - var2.actions[var5] = var0.readStringCp1252NullTerminated(); - } - } - - if ((var3 & 2) != 0) { - var2.overheadText = var0.readStringCp1252NullTerminated(); - if (var2.overheadText.charAt(0) == '~') { - var2.overheadText = var2.overheadText.substring(1); - GrandExchangeOfferAgeComparator.addGameMessage(2, var2.username.getName(), var2.overheadText); - } else if (var2 == class215.localPlayer) { - GrandExchangeOfferAgeComparator.addGameMessage(2, var2.username.getName(), var2.overheadText); - } - - var2.isAutoChatting = false; - var2.overheadTextColor = 0; - var2.overheadTextEffect = 0; - var2.overheadTextCyclesRemaining = 150; - } - - if ((var3 & 1) != 0) { - var2.targetIndex = var0.method5719(); - if (var2.targetIndex == 65535) { - var2.targetIndex = -1; - } - } - - if ((var3 & 32) != 0) { - var2.field965 = var0.method5640(); - if (var2.pathLength == 0) { - var2.orientation = var2.field965; - var2.field965 = -1; - } - } - - int var13; - if ((var3 & 16) != 0) { - var5 = var0.method5719(); - if (var5 == 65535) { - var5 = -1; - } - - var13 = var0.method5689(); - WorldMapRectangle.performPlayerAnimation(var2, var5, var13); - } - - int var8; - int var9; - int var12; - if ((var3 & 8) != 0) { - var5 = var0.readUnsignedByte(); - int var10; - int var11; - int var14; - if (var5 > 0) { - for (var13 = 0; var13 < var5; ++var13) { - var8 = -1; - var9 = -1; - var10 = -1; - var14 = var0.readUShortSmart(); - if (var14 == 32767) { - var14 = var0.readUShortSmart(); - var9 = var0.readUShortSmart(); - var8 = var0.readUShortSmart(); - var10 = var0.readUShortSmart(); - } else if (var14 != 32766) { - var9 = var0.readUShortSmart(); - } else { - var14 = -1; - } - - var11 = var0.readUShortSmart(); - var2.addHitSplat(var14, var9, var8, var10, Client.cycle, var11); - } - } - - var13 = var0.method5631(); - if (var13 > 0) { - for (var14 = 0; var14 < var13; ++var14) { - var8 = var0.readUShortSmart(); - var9 = var0.readUShortSmart(); - if (var9 != 32767) { - var10 = var0.readUShortSmart(); - var11 = var0.method5631(); - var12 = var9 > 0 ? var0.method5728() : var11; - var2.addHealthBar(var8, Client.cycle, var9, var10, var11, var12); - } else { - var2.removeHealthBar(var8); + for (int var2 = 0; var2 < var1.length; ++var2) { + Widget var3 = var1[var2]; + if (var3.onLoad != null) { + ScriptEvent var4 = new ScriptEvent(); + var4.widget = var3; + var4.args = var3.onLoad; + GrandExchangeEvents.runScript(var4, 5000000); } } + } } - - if ((var3 & 64) != 0) { - var5 = var0.method5719(); - PlayerType var16 = (PlayerType)CollisionMap.findEnumerated(class2.PlayerType_values(), var0.method5728()); - boolean var19 = var0.method5631() == 1; - var8 = var0.readUnsignedByte(); - var9 = var0.offset; - if (var2.username != null && var2.appearance != null) { - boolean var18 = false; - if (var16.isUser && VertexNormal.friendSystem.isIgnored(var2.username)) { - var18 = true; - } - - if (!var18 && Client.field756 == 0 && !var2.isHidden) { - field1252.offset = 0; - var0.readBytes(field1252.array, 0, var8); - field1252.offset = 0; - String var15 = AbstractFont.escapeBrackets(class191.method3720(GrandExchangeOfferUnitPriceComparator.method142(field1252))); - var2.overheadText = var15.trim(); - var2.overheadTextColor = var5 >> 8; - var2.overheadTextEffect = var5 & 255; - var2.overheadTextCyclesRemaining = 150; - var2.isAutoChatting = var19; - var2.field950 = var2 != class215.localPlayer && var16.isUser && "" != Client.field860 && var15.toLowerCase().indexOf(Client.field860) == -1; - if (var16.isPrivileged) { - var12 = var19 ? 91 : 1; - } else { - var12 = var19 ? 90 : 2; - } - - if (var16.modIcon != -1) { - GrandExchangeOfferAgeComparator.addGameMessage(var12, Client.method1749(var16.modIcon) + var2.username.getName(), var15); - } else { - GrandExchangeOfferAgeComparator.addGameMessage(var12, var2.username.getName(), var15); - } - } - } - - var0.offset = var9 + var8; - } - - if (var2.field630) { - if (var4 == 127) { - var2.resetPath(var2.tileX, var2.tileY); - } else { - byte var17; - if (var4 != -1) { - var17 = var4; - } else { - var17 = field1247[var1]; - } - - var2.method1255(var2.tileX, var2.tileY, var17); - } - } - } } diff --git a/runescape-client/src/main/java/PrivateChatMode.java b/runescape-client/src/main/java/PrivateChatMode.java index 58c31f8a14..c22cafebd8 100644 --- a/runescape-client/src/main/java/PrivateChatMode.java +++ b/runescape-client/src/main/java/PrivateChatMode.java @@ -1,39 +1,123 @@ +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("kc") +@ObfuscatedName("ku") @Implements("PrivateChatMode") public class PrivateChatMode { - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lkc;" - ) - static final PrivateChatMode field3794; @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lkc;" + signature = "Lku;" ) - public static final PrivateChatMode field3792; - @ObfuscatedName("b") + static final PrivateChatMode field3790; + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lkc;" + signature = "Lku;" ) - static final PrivateChatMode field3793; - @ObfuscatedName("g") + public static final PrivateChatMode field3791; + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "Lku;" + ) + static final PrivateChatMode field3792; + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "Lho;" + ) + @Export("NetCache_currentResponse") + public static NetFileRequest NetCache_currentResponse; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 749453675 + intValue = 1903603553 ) - public final int field3795; + public final int field3793; static { - field3794 = new PrivateChatMode(0); - field3792 = new PrivateChatMode(1); - field3793 = new PrivateChatMode(2); + field3790 = new PrivateChatMode(0); + field3791 = new PrivateChatMode(1); + field3792 = new PrivateChatMode(2); } PrivateChatMode(int var1) { - this.field3795 = var1; + this.field3793 = var1; + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "(Lkq;IIIIIII)V", + garbageValue = "-1462890137" + ) + @Export("loadTerrain") + static final void loadTerrain(Buffer var0, int var1, int var2, int var3, int var4, int var5, int var6) { + int var7; + if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { + Tiles.Tiles_renderFlags[var1][var2][var3] = 0; + + while (true) { + var7 = var0.readUnsignedByte(); + if (var7 == 0) { + if (var1 == 0) { + int[] var8 = Tiles.Tiles_heights[0][var2]; + int var11 = var2 + var4 + 932731; + int var12 = var3 + var5 + 556238; + int var13 = CollisionMap.method3530(45365 + var11, 91923 + var12, 4) - 128 + (CollisionMap.method3530(var11 + 10294, var12 + 37821, 2) - 128 >> 1) + (CollisionMap.method3530(var11, var12, 1) - 128 >> 2); + var13 = (int)(0.3D * (double)var13) + 35; + if (var13 < 10) { + var13 = 10; + } else if (var13 > 60) { + var13 = 60; + } + + var8[var3] = -var13 * 8; + } else { + Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; + } + break; + } + + if (var7 == 1) { + int var14 = var0.readUnsignedByte(); + if (var14 == 1) { + var14 = 0; + } + + if (var1 == 0) { + Tiles.Tiles_heights[0][var2][var3] = -var14 * 8; + } else { + Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var14 * 8; + } + break; + } + + if (var7 <= 49) { + Tiles.field498[var1][var2][var3] = var0.readByte(); + Tiles.field494[var1][var2][var3] = (byte)((var7 - 2) / 4); + Tiles.field493[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); + } else if (var7 <= 81) { + Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); + } else { + class14.field88[var1][var2][var3] = (byte)(var7 - 81); + } + } + } else { + while (true) { + var7 = var0.readUnsignedByte(); + if (var7 == 0) { + break; + } + + if (var7 == 1) { + var0.readUnsignedByte(); + break; + } + + if (var7 <= 49) { + var0.readUnsignedByte(); + } + } + } + } } diff --git a/runescape-client/src/main/java/Projectile.java b/runescape-client/src/main/java/Projectile.java index fd5a77289b..0656f3a10f 100644 --- a/runescape-client/src/main/java/Projectile.java +++ b/runescape-client/src/main/java/Projectile.java @@ -1,135 +1,138 @@ -import java.lang.management.GarbageCollectorMXBean; -import java.lang.management.ManagementFactory; -import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ck") +@ObfuscatedName("ch") @Implements("Projectile") public final class Projectile extends Entity { - @ObfuscatedName("u") + @ObfuscatedName("pu") + @Export("ClanChat_inClanChat") + static boolean ClanChat_inClanChat; + @ObfuscatedName("gq") + @Export("regionLandArchives") + static byte[][] regionLandArchives; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -305289079 + intValue = -1703591311 ) @Export("id") int id; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1537056881 + intValue = -845014759 ) @Export("plane") int plane; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -337393941 + intValue = -328168931 ) @Export("sourceX") int sourceX; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 2147267957 + intValue = 1855488401 ) @Export("sourceY") int sourceY; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -428397397 + intValue = 737715987 ) @Export("sourceZ") int sourceZ; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -590668105 + intValue = 2134502189 ) @Export("endHeight") int endHeight; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -849991729 + intValue = -1548140981 ) @Export("cycleStart") int cycleStart; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -2024894323 + intValue = 880668883 ) @Export("cycleEnd") int cycleEnd; - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 565117017 + intValue = 1309211807 ) @Export("slope") int slope; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1041468425 + intValue = 293583689 ) @Export("startHeight") int startHeight; - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -2008070407 + intValue = -829767875 ) @Export("targetIndex") int targetIndex; - @ObfuscatedName("x") + @ObfuscatedName("o") @Export("isMoving") boolean isMoving; - @ObfuscatedName("o") + @ObfuscatedName("v") @Export("x") double x; - @ObfuscatedName("e") + @ObfuscatedName("k") @Export("y") double y; - @ObfuscatedName("n") + @ObfuscatedName("s") @Export("z") double z; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("speedX") double speedX; - @ObfuscatedName("c") + @ObfuscatedName("t") @Export("speedY") double speedY; - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("speed") double speed; - @ObfuscatedName("d") + @ObfuscatedName("n") @Export("speedZ") double speedZ; - @ObfuscatedName("s") + @ObfuscatedName("u") @Export("accelerationZ") double accelerationZ; - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1946189475 + intValue = -361002303 ) @Export("yaw") int yaw; - @ObfuscatedName("m") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -2107591311 + intValue = 1134638097 ) @Export("pitch") int pitch; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Liy;" + signature = "Liv;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("q") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1753493809 + intValue = 1878850511 ) @Export("frame") int frame; - @ObfuscatedName("l") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 339364237 + intValue = -321232817 ) @Export("frameCycle") int frameCycle; @@ -150,19 +153,19 @@ public final class Projectile extends Entity { this.targetIndex = var10; this.endHeight = var11; this.isMoving = false; - int var12 = WorldMapRegion.SpotAnimationDefinition_get(this.id).sequence; + int var12 = ClientPacket.SpotAnimationDefinition_get(this.id).sequence; if (var12 != -1) { - this.sequenceDefinition = GrandExchangeOfferAgeComparator.SequenceDefinition_get(var12); + this.sequenceDefinition = WorldMapSection0.SequenceDefinition_get(var12); } else { this.sequenceDefinition = null; } } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "1065266514" + signature = "(IIIIS)V", + garbageValue = "3907" ) @Export("setDestination") final void setDestination(int var1, int var2, int var3, int var4) { @@ -170,34 +173,34 @@ public final class Projectile extends Entity { if (!this.isMoving) { var5 = (double)(var1 - this.sourceX); double var7 = (double)(var2 - this.sourceY); - double var9 = Math.sqrt(var5 * var5 + var7 * var7); - this.x = var5 * (double)this.startHeight / var9 + (double)this.sourceX; - this.y = (double)this.sourceY + var7 * (double)this.startHeight / var9; + double var9 = Math.sqrt(var7 * var7 + var5 * var5); + this.x = (double)this.sourceX + var5 * (double)this.startHeight / var9; + this.y = var7 * (double)this.startHeight / var9 + (double)this.sourceY; 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); + this.speedZ = -this.speed * Math.tan((double)this.slope * 0.02454369D); } - this.accelerationZ = ((double)var3 - this.z - var5 * this.speedZ) * 2.0D / (var5 * var5); + this.accelerationZ = 2.0D * ((double)var3 - this.z - this.speedZ * var5) / (var5 * var5); } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "-67" + signature = "(II)V", + garbageValue = "-1141116795" ) @Export("advance") final void advance(int var1) { this.isMoving = true; - this.x += (double)var1 * this.speedX; + this.x += this.speedX * (double)var1; this.y += this.speedY * (double)var1; - this.z += (double)var1 * this.accelerationZ * 0.5D * (double)var1 + (double)var1 * this.speedZ; + this.z += (double)var1 * this.accelerationZ * 0.5D * (double)var1 + this.speedZ * (double)var1; 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; @@ -223,14 +226,14 @@ public final class Projectile extends Entity { } } - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)Ldf;", - garbageValue = "-174129419" + signature = "(I)Ldw;", + garbageValue = "822221372" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = WorldMapRegion.SpotAnimationDefinition_get(this.id); + SpotAnimationDefinition var1 = ClientPacket.SpotAnimationDefinition_get(this.id); Model var2 = var1.getModel(this.frame); if (var2 == null) { return null; @@ -240,61 +243,16 @@ public final class Projectile extends Entity { } } - @ObfuscatedName("ap") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-118702125" + signature = "(II)Ljava/lang/String;", + garbageValue = "919404016" ) - @Export("getGcDuration") - protected static int getGcDuration() { - int var0 = 0; - if (UserComparator9.garbageCollector == null || !UserComparator9.garbageCollector.isValid()) { - try { - Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); - - while (var1.hasNext()) { - GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); - if (var2.isValid()) { - UserComparator9.garbageCollector = var2; - GameShell.garbageCollectorLastCheckTimeMs = -1L; - GameShell.garbageCollectorLastCollectionTime = -1L; - } - } - } catch (Throwable var11) { - } - } - - if (UserComparator9.garbageCollector != null) { - long var9 = TaskHandler.currentTimeMillis(); - long var3 = UserComparator9.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("fi") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1897306098" - ) - static final void method2137() { - if (Client.logoutTimer > 0) { - class40.logOut(); + static final String method2129(int var0) { + if (var0 < 100000) { + return "" + var0 + ""; } else { - Client.timer.method5072(); - class81.updateGameState(40); - PcmPlayer.field1413 = Client.packetWriter.getSocket(); - Client.packetWriter.removeSocket(); + return var0 < 10000000 ? "" + var0 / 1000 + "K" + "" : "" + var0 / 1000000 + "M" + ""; } } } diff --git a/runescape-client/src/main/java/RasterProvider.java b/runescape-client/src/main/java/RasterProvider.java index 39a3daddf3..70d2289f10 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("bi") +@ObfuscatedName("ab") @Implements("RasterProvider") public final class RasterProvider extends AbstractRasterProvider { - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("component") Component component; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("image") Image image; @@ -36,40 +36,40 @@ public final class RasterProvider extends AbstractRasterProvider { this.apply(); } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Ljava/awt/Component;I)V", - garbageValue = "-1673763486" + signature = "(Ljava/awt/Component;B)V", + garbageValue = "127" ) @Export("setComponent") final void setComponent(Component var1) { this.component = var1; } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "0" + signature = "(III)V", + garbageValue = "1570881200" ) @Export("drawFull") public final void drawFull(int var1, int var2) { this.drawFull0(this.component.getGraphics(), var1, var2); } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "-787999204" + signature = "(IIIIB)V", + garbageValue = "-116" ) @Export("draw") public final void draw(int var1, int var2, int var3, int var4) { this.draw0(this.component.getGraphics(), var1, var2, var3, var4); } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(Ljava/awt/Graphics;III)V", - garbageValue = "251368234" + garbageValue = "-89476481" ) @Export("drawFull0") final void drawFull0(Graphics var1, int var2, int var3) { @@ -81,10 +81,10 @@ public final class RasterProvider extends AbstractRasterProvider { } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Ljava/awt/Graphics;IIIIB)V", - garbageValue = "-67" + signature = "(Ljava/awt/Graphics;IIIII)V", + garbageValue = "691576069" ) @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 66431760a4..09d2830bfd 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("ly") +@ObfuscatedName("lj") @Implements("Rasterizer2D") public class Rasterizer2D extends DualNode { - @ObfuscatedName("ad") + @ObfuscatedName("av") @Export("Rasterizer2D_pixels") public static int[] Rasterizer2D_pixels; - @ObfuscatedName("am") + @ObfuscatedName("aw") @Export("Rasterizer2D_width") public static int Rasterizer2D_width; - @ObfuscatedName("ai") + @ObfuscatedName("as") @Export("Rasterizer2D_height") public static int Rasterizer2D_height; - @ObfuscatedName("ag") + @ObfuscatedName("ak") @Export("Rasterizer2D_yClipStart") public static int Rasterizer2D_yClipStart; - @ObfuscatedName("ao") + @ObfuscatedName("au") @Export("Rasterizer2D_yClipEnd") public static int Rasterizer2D_yClipEnd; - @ObfuscatedName("aw") + @ObfuscatedName("ah") @Export("Rasterizer2D_xClipStart") public static int Rasterizer2D_xClipStart; - @ObfuscatedName("ak") + @ObfuscatedName("aq") @Export("Rasterizer2D_xClipEnd") public static int Rasterizer2D_xClipEnd; @@ -38,7 +38,7 @@ public class Rasterizer2D extends DualNode { protected Rasterizer2D() { } - @ObfuscatedName("dn") + @ObfuscatedName("cc") @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("ds") + @ObfuscatedName("cv") @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("dh") + @ObfuscatedName("cw") @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("dt") + @ObfuscatedName("do") @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("dz") + @ObfuscatedName("dk") @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("dr") + @ObfuscatedName("dx") @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("dl") + @ObfuscatedName("de") @Export("Rasterizer2D_clear") public static void Rasterizer2D_clear() { int var0 = 0; @@ -141,7 +141,7 @@ public class Rasterizer2D extends DualNode { } - @ObfuscatedName("db") + @ObfuscatedName("df") @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("da") + @ObfuscatedName("di") @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("dq") + @ObfuscatedName("dr") @Export("Rasterizer2D_fillRectangleAlpha") public static void Rasterizer2D_fillRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { if (var0 < Rasterizer2D_xClipStart) { @@ -387,7 +387,7 @@ public class Rasterizer2D extends DualNode { } - @ObfuscatedName("do") + @ObfuscatedName("dg") @Export("Rasterizer2D_fillRectangle") public static void Rasterizer2D_fillRectangle(int var0, int var1, int var2, int var3, int var4) { if (var0 < Rasterizer2D_xClipStart) { @@ -421,7 +421,7 @@ public class Rasterizer2D extends DualNode { } - @ObfuscatedName("du") + @ObfuscatedName("dh") @Export("Rasterizer2D_fillRectangleGradient") public static void Rasterizer2D_fillRectangleGradient(int var0, int var1, int var2, int var3, int var4, int var5) { if (var2 > 0 && var3 > 0) { @@ -465,7 +465,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("dv") + @ObfuscatedName("dl") @Export("Rasterizer2D_fillRectangleGradientAlpha") public static void Rasterizer2D_fillRectangleGradientAlpha(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { if (var2 > 0 && var3 > 0) { @@ -523,7 +523,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("dg") + @ObfuscatedName("da") @ObfuscatedSignature( signature = "(IIIIII[BIZ)V", garbageValue = "1" @@ -604,7 +604,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("dm") + @ObfuscatedName("dp") @Export("Rasterizer2D_drawRectangle") public static void Rasterizer2D_drawRectangle(int var0, int var1, int var2, int var3, int var4) { Rasterizer2D_drawHorizontalLine(var0, var1, var2, var4); @@ -613,7 +613,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_drawVerticalLine(var0 + var2 - 1, var1, var3, var4); } - @ObfuscatedName("df") + @ObfuscatedName("ds") @Export("Rasterizer2D_drawRectangleAlpha") public static void Rasterizer2D_drawRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { Rasterizer2D_drawHorizontalLineAlpha(var0, var1, var2, var4, var5); @@ -625,7 +625,7 @@ public class Rasterizer2D extends DualNode { } - @ObfuscatedName("dd") + @ObfuscatedName("db") @Export("Rasterizer2D_drawHorizontalLine") public static void Rasterizer2D_drawHorizontalLine(int var0, int var1, int var2, int var3) { if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { @@ -647,7 +647,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("dy") + @ObfuscatedName("dn") @Export("Rasterizer2D_drawHorizontalLineAlpha") static void Rasterizer2D_drawHorizontalLineAlpha(int var0, int var1, int var2, int var3, int var4) { if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { @@ -677,7 +677,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("eg") + @ObfuscatedName("dt") @Export("Rasterizer2D_drawVerticalLine") public static void Rasterizer2D_drawVerticalLine(int var0, int var1, int var2, int var3) { if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { @@ -699,7 +699,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("ey") + @ObfuscatedName("dc") @Export("Rasterizer2D_drawVerticalLineAlpha") static void Rasterizer2D_drawVerticalLineAlpha(int var0, int var1, int var2, int var3, int var4) { if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { @@ -730,7 +730,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("ec") + @ObfuscatedName("dd") @Export("Rasterizer2D_drawLine") public static void Rasterizer2D_drawLine(int var0, int var1, int var2, int var3, int var4) { var2 -= var0; @@ -812,7 +812,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("el") + @ObfuscatedName("dv") @Export("Rasterizer2D_setPixel") static void Rasterizer2D_setPixel(int var0, int var1, int var2) { if (var0 >= Rasterizer2D_xClipStart && var1 >= Rasterizer2D_yClipStart && var0 < Rasterizer2D_xClipEnd && var1 < Rasterizer2D_yClipEnd) { @@ -820,7 +820,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("em") + @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 d85fc9b9b1..2f14972278 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("eg") +@ObfuscatedName("et") @Implements("Rasterizer3D") public class Rasterizer3D extends Rasterizer2D { - @ObfuscatedName("u") - static boolean field1757; @ObfuscatedName("f") - static boolean field1748; - @ObfuscatedName("b") + static boolean field1751; + @ObfuscatedName("i") + static boolean field1758; + @ObfuscatedName("y") @Export("Rasterizer3D_isLowDetailTexture") static boolean Rasterizer3D_isLowDetailTexture; - @ObfuscatedName("g") - public static boolean field1750; - @ObfuscatedName("z") + @ObfuscatedName("w") + public static boolean field1739; + @ObfuscatedName("p") @Export("Rasterizer3D_alpha") static int Rasterizer3D_alpha; - @ObfuscatedName("x") + @ObfuscatedName("o") @Export("Rasterizer3D_zoom") public static int Rasterizer3D_zoom; - @ObfuscatedName("o") + @ObfuscatedName("v") @Export("Rasterizer3D_clipMidX") static int Rasterizer3D_clipMidX; - @ObfuscatedName("e") + @ObfuscatedName("k") @Export("Rasterizer3D_clipMidY") static int Rasterizer3D_clipMidY; - @ObfuscatedName("n") + @ObfuscatedName("s") @Export("Rasterizer3D_clipWidth") static int Rasterizer3D_clipWidth; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("Rasterizer3D_clipHeight") static int Rasterizer3D_clipHeight; - @ObfuscatedName("c") + @ObfuscatedName("t") @Export("Rasterizer3D_clipNegativeMidX") static int Rasterizer3D_clipNegativeMidX; - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("Rasterizer3D_clipMidX2") static int Rasterizer3D_clipMidX2; - @ObfuscatedName("d") + @ObfuscatedName("n") @Export("Rasterizer3D_clipNegativeMidY") static int Rasterizer3D_clipNegativeMidY; - @ObfuscatedName("s") + @ObfuscatedName("u") @Export("Rasterizer3D_clipMidY2") static int Rasterizer3D_clipMidY2; - @ObfuscatedName("t") + @ObfuscatedName("z") @Export("Rasterizer3D_rowOffsets") static int[] Rasterizer3D_rowOffsets; - @ObfuscatedName("m") + @ObfuscatedName("h") @Export("Rasterizer3D_colorPalette") public static int[] Rasterizer3D_colorPalette; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lek;" + signature = "Lev;" ) @Export("Rasterizer3D_textureLoader") public static TextureLoader Rasterizer3D_textureLoader; + @ObfuscatedName("g") + static int[] field1737; + @ObfuscatedName("r") + static int[] field1760; @ObfuscatedName("q") - static int[] field1770; - @ObfuscatedName("l") - static int[] field1771; - @ObfuscatedName("j") @Export("Rasterizer3D_sine") public static int[] Rasterizer3D_sine; - @ObfuscatedName("af") + @ObfuscatedName("aa") @Export("Rasterizer3D_cosine") public static int[] Rasterizer3D_cosine; static { - field1757 = false; - field1748 = false; + field1751 = false; + field1758 = false; Rasterizer3D_isLowDetailTexture = false; - field1750 = true; + field1739 = true; Rasterizer3D_alpha = 0; Rasterizer3D_zoom = 512; Rasterizer3D_rowOffsets = new int[1024]; Rasterizer3D_colorPalette = new int[65536]; - field1770 = new int[512]; - field1771 = new int[2048]; + field1737 = new int[512]; + field1760 = new int[2048]; Rasterizer3D_sine = new int[2048]; Rasterizer3D_cosine = new int[2048]; int var0; for (var0 = 1; var0 < 512; ++var0) { - field1770[var0] = 32768 / var0; + field1737[var0] = 32768 / var0; } for (var0 = 1; var0 < 2048; ++var0) { - field1771[var0] = 65536 / var0; + field1760[var0] = 65536 / var0; } for (var0 = 0; var0 < 2048; ++var0) { @@ -98,32 +98,42 @@ public class Rasterizer3D extends Rasterizer2D { } - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("Rasterizer3D_setClipFromRasterizer2D") public static final void Rasterizer3D_setClipFromRasterizer2D() { Rasterizer3D_setClip(Rasterizer2D.Rasterizer2D_xClipStart, Rasterizer2D.Rasterizer2D_yClipStart, Rasterizer2D.Rasterizer2D_xClipEnd, Rasterizer2D.Rasterizer2D_yClipEnd); } - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("Rasterizer3D_setClip") static final void Rasterizer3D_setClip(int var0, int var1, int var2, int var3) { Rasterizer3D_clipWidth = var2 - var0; Rasterizer3D_clipHeight = var3 - var1; Rasterizer3D_method3(); + int var4; + int var5; if (Rasterizer3D_rowOffsets.length < Rasterizer3D_clipHeight) { - Rasterizer3D_rowOffsets = new int[WorldMapID.method566(Rasterizer3D_clipHeight)]; + var5 = Rasterizer3D_clipHeight; + --var5; + var5 |= var5 >>> 1; + var5 |= var5 >>> 2; + var5 |= var5 >>> 4; + var5 |= var5 >>> 8; + var5 |= var5 >>> 16; + var4 = var5 + 1; + Rasterizer3D_rowOffsets = new int[var4]; } - int var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1; + var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1; - for (int var5 = 0; var5 < Rasterizer3D_clipHeight; ++var5) { + for (var5 = 0; var5 < Rasterizer3D_clipHeight; ++var5) { Rasterizer3D_rowOffsets[var5] = var4; var4 += Rasterizer2D.Rasterizer2D_width; } } - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("Rasterizer3D_method3") public static final void Rasterizer3D_method3() { Rasterizer3D_clipMidX = Rasterizer3D_clipWidth / 2; @@ -134,8 +144,8 @@ public class Rasterizer3D extends Rasterizer2D { Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; } - @ObfuscatedName("g") - public static final void method3024(int var0, int var1) { + @ObfuscatedName("w") + public static final void method3086(int var0, int var1) { int var2 = Rasterizer3D_rowOffsets[0]; int var3 = var2 / Rasterizer2D.Rasterizer2D_width; int var4 = var2 - var3 * Rasterizer2D.Rasterizer2D_width; @@ -147,22 +157,22 @@ public class Rasterizer3D extends Rasterizer2D { Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Lek;)V" + signature = "(Lev;)V" ) @Export("Rasterizer3D_setTextureLoader") public static final void Rasterizer3D_setTextureLoader(TextureLoader var0) { Rasterizer3D_textureLoader = var0; } - @ObfuscatedName("p") + @ObfuscatedName("b") @Export("Rasterizer3D_setBrightness") public static final void Rasterizer3D_setBrightness(double var0) { Rasterizer3D_buildPalette(var0, 0, 512); } - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("Rasterizer3D_buildPalette") static final void Rasterizer3D_buildPalette(double var0, int var2, int var3) { int var4 = var2 * 128; @@ -241,7 +251,7 @@ public class Rasterizer3D extends Rasterizer2D { } - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("Rasterizer3D_brighten") static int Rasterizer3D_brighten(int var0, double var1) { double var3 = (double)(var0 >> 16) / 256.0D; @@ -256,13 +266,13 @@ public class Rasterizer3D extends Rasterizer2D { return var11 + (var10 << 8) + (var9 << 16); } - @ObfuscatedName("w") - public static void method3035(int var0, int var1, int var2) { - field1757 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; + @ObfuscatedName("a") + public static void method3078(int var0, int var1, int var2) { + field1751 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; } - @ObfuscatedName("i") - static final void method3030(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + @ObfuscatedName("d") + static final void method3000(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; @@ -477,35 +487,7 @@ public class Rasterizer3D extends Rasterizer2D { var2 = 0; } - if (var2 != var1 && var16 < var15 || var2 == var1 && var16 > var17) { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var0; - if (var0 < 0) { - return; - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, 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; - } - } else { + if ((var2 == var1 || var16 >= var15) && (var2 != var1 || var16 <= var17)) { var0 -= var2; var2 -= var1; var1 = Rasterizer3D_rowOffsets[var1]; @@ -533,6 +515,34 @@ public class Rasterizer3D extends Rasterizer2D { var7 += var20; var1 += Rasterizer2D.Rasterizer2D_width; } + } else { + var0 -= var2; + var2 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, 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; + } } } else { var5 = var4 <<= 14; @@ -767,10 +777,10 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("k") + @ObfuscatedName("c") @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 (field1757) { + if (field1751) { if (var5 > Rasterizer3D_clipWidth) { var5 = Rasterizer3D_clipWidth; } @@ -786,7 +796,7 @@ public class Rasterizer3D extends Rasterizer2D { int var8; int var9; int var10; - if (field1750) { + if (field1739) { var3 = var5 - var4 >> 2; var7 <<= 2; if (Rasterizer3D_alpha == 0) { @@ -870,8 +880,8 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("x") - public static final void method3055(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("o") + public static final void method3008(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); @@ -911,33 +921,7 @@ public class Rasterizer3D extends Rasterizer2D { var1 = 0; } - if ((var0 == var1 || var9 >= var7) && (var0 != var1 || var9 <= var8)) { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, 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; - } - } else { + if (var0 != var1 && var9 < var7 || var0 == var1 && var9 > var8) { var2 -= var1; var1 -= var0; var0 = Rasterizer3D_rowOffsets[var0]; @@ -963,6 +947,32 @@ public class Rasterizer3D extends Rasterizer2D { var3 += var7; var0 += Rasterizer2D.Rasterizer2D_width; } + } else { + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, 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; + } } } else { var4 = var3 <<= 14; @@ -1326,10 +1336,10 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("o") + @ObfuscatedName("l") @Export("Rasterizer3D_horizAlpha") static final void Rasterizer3D_horizAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5) { - if (field1757) { + if (field1751) { if (var5 > Rasterizer3D_clipWidth) { var5 = Rasterizer3D_clipWidth; } @@ -1421,16 +1431,16 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("e") - static final void method3034(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18) { + @ObfuscatedName("t") + static final void method3010(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18) { int[] var19 = Rasterizer3D_textureLoader.getTexturePixels(var18); int var20; if (var19 == null) { var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); - method3030(var0, var1, var2, var3, var4, var5, method3038(var20, var6), method3038(var20, var7), method3038(var20, var8)); + method3000(var0, var1, var2, var3, var4, var5, method3014(var20, var6), method3014(var20, var7), method3014(var20, var8)); } else { Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); - field1748 = Rasterizer3D_textureLoader.vmethod3330(var18); + field1758 = Rasterizer3D_textureLoader.vmethod3284(var18); var20 = var4 - var3; int var21 = var1 - var0; int var22 = var5 - var3; @@ -1502,41 +1512,7 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; var35 += var37 * var41; var38 += var40 * var41; - if (var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, 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 { + if ((var0 == var1 || var28 >= var26) && (var0 != var1 || var28 <= var27)) { var2 -= var1; var1 -= var0; var0 = Rasterizer3D_rowOffsets[var0]; @@ -1570,6 +1546,40 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; var38 += var40; } + } else { + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, 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 { var4 = var3 <<= 14; @@ -1590,41 +1600,7 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; var35 += var37 * var41; var38 += var40 * var41; - if ((var0 == var2 || var28 >= var26) && (var0 != var2 || var27 <= var26)) { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, 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 { + if (var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) { var1 -= var2; var2 -= var0; var0 = Rasterizer3D_rowOffsets[var0]; @@ -1658,6 +1634,40 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; var38 += var40; } + } else { + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, 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; + } } } } @@ -1691,41 +1701,7 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; var35 += var37 * var41; var38 += var40 * var41; - if (var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var0; - if (var0 < 0) { - return; - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, 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 { + if ((var2 == var1 || var26 >= var27) && (var2 != var1 || var26 <= var28)) { var0 -= var2; var2 -= var1; var1 = Rasterizer3D_rowOffsets[var1]; @@ -1759,6 +1735,40 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; var38 += var40; } + } else { + var0 -= var2; + var2 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, 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 { var5 = var4 <<= 14; @@ -2042,10 +2052,10 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("n") + @ObfuscatedName("j") @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 (field1757) { + if (field1751) { if (var6 > Rasterizer3D_clipWidth) { var6 = Rasterizer3D_clipWidth; } @@ -2109,7 +2119,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; var8 <<= 3; var15 = var7 >> 8; - if (field1748) { + if (field1758) { if (var17 > 0) { do { var3 = var1[(var2 >>> 26) + (var2 & 4032)]; @@ -2304,7 +2314,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; var8 <<= 3; var15 = var7 >> 8; - if (field1748) { + if (field1758) { if (var17 > 0) { do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; @@ -2463,17 +2473,17 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("c") + @ObfuscatedName("n") @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); - method3030(var0, var1, var2, var3, var4, var5, method3038(var20, var6), method3038(var20, var7), method3038(var20, var8)); + method3000(var0, var1, var2, var3, var4, var5, method3014(var20, var6), method3014(var20, var7), method3014(var20, var8)); } else { Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); - field1748 = Rasterizer3D_textureLoader.vmethod3330(var18); + field1758 = Rasterizer3D_textureLoader.vmethod3284(var18); var20 = var4 - var3; int var21 = var1 - var0; int var22 = var5 - var3; @@ -2545,41 +2555,7 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; var35 += var37 * var41; var38 += var40 * var41; - if (var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, 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 += var28; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } else { + if ((var0 == var1 || var28 >= var26) && (var0 != var1 || var28 <= var27)) { var2 -= var1; var1 -= var0; var0 = Rasterizer3D_rowOffsets[var0]; @@ -2613,6 +2589,40 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; var38 += var40; } + } else { + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, 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 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } } } else { var4 = var3 <<= 14; @@ -2734,41 +2744,7 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; var35 += var37 * var41; var38 += var40 * var41; - if (var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var0; - if (var0 < 0) { - return; - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, 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 { + if ((var2 == var1 || var26 >= var27) && (var2 != var1 || var26 <= var28)) { var0 -= var2; var2 -= var1; var1 = Rasterizer3D_rowOffsets[var1]; @@ -2802,6 +2778,40 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; var38 += var40; } + } else { + var0 -= var2; + var2 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, 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; @@ -3085,10 +3095,10 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("s") + @ObfuscatedName("u") @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 (field1757) { + if (field1751) { if (var6 > Rasterizer3D_clipWidth) { var6 = Rasterizer3D_clipWidth; } @@ -3141,7 +3151,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; var8 <<= 3; var15 = var7 >> 8; - if (field1748) { + if (field1758) { if (var17 > 0) { do { var3 = var1[(var2 >>> 26) + (var2 & 4032)]; @@ -3284,7 +3294,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; var8 <<= 3; var15 = var7 >> 8; - if (field1748) { + if (field1758) { if (var17 > 0) { do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; @@ -3401,8 +3411,8 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("t") - static final int method3038(int var0, int var1) { + @ObfuscatedName("z") + static final int method3014(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; if (var1 < 2) { var1 = 2; @@ -3413,33 +3423,33 @@ public class Rasterizer3D extends Rasterizer2D { return (var0 & 65408) + var1; } - @ObfuscatedName("m") - static final int method3039(int var0, int var1, int var2, int var3) { + @ObfuscatedName("h") + static final int method3015(int var0, int var1, int var2, int var3) { return var0 * var2 + var3 * var1 >> 16; } - @ObfuscatedName("v") - static final int method3081(int var0, int var1, int var2, int var3) { + @ObfuscatedName("m") + static final int method3016(int var0, int var1, int var2, int var3) { return var2 * var1 - var3 * var0 >> 16; } - @ObfuscatedName("q") - static final int method3054(int var0, int var1, int var2, int var3) { + @ObfuscatedName("aa") + static final int method3017(int var0, int var1, int var2, int var3) { return var0 * var2 - var3 * var1 >> 16; } - @ObfuscatedName("l") - static final int method3067(int var0, int var1, int var2, int var3) { + @ObfuscatedName("av") + static final int method3083(int var0, int var1, int var2, int var3) { return var3 * var0 + var2 * var1 >> 16; } - @ObfuscatedName("j") - static final int method3048(int var0, int var1, int var2, int var3) { + @ObfuscatedName("aw") + static final int method3019(int var0, int var1, int var2, int var3) { return var0 * var2 + var3 * var1 >> 16; } - @ObfuscatedName("ad") - static final int method3044(int var0, int var1, int var2, int var3) { + @ObfuscatedName("as") + static final int method3020(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 39166f684f..a53c9252ef 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("ds") +@ObfuscatedName("dg") @Implements("RawPcmStream") public class RawPcmStream extends PcmStream { - @ObfuscatedName("u") - int field1467; @ObfuscatedName("f") - int field1457; - @ObfuscatedName("b") - int field1458; - @ObfuscatedName("g") - int field1459; - @ObfuscatedName("z") - int field1460; - @ObfuscatedName("p") - int field1470; - @ObfuscatedName("h") - int field1462; + int field1428; + @ObfuscatedName("i") + int field1426; @ObfuscatedName("y") + int field1427; + @ObfuscatedName("p") + int field1432; + @ObfuscatedName("b") + int field1429; + @ObfuscatedName("e") + int field1430; + @ObfuscatedName("x") + int field1431; + @ObfuscatedName("a") @Export("numLoops") int numLoops; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("start") int start; - @ObfuscatedName("k") + @ObfuscatedName("c") @Export("end") int end; - @ObfuscatedName("x") - boolean field1466; @ObfuscatedName("o") - int field1465; - @ObfuscatedName("e") - int field1456; - @ObfuscatedName("n") - int field1469; - @ObfuscatedName("r") - int field1468; + boolean field1435; + @ObfuscatedName("v") + int field1437; + @ObfuscatedName("k") + int field1436; + @ObfuscatedName("s") + int field1438; + @ObfuscatedName("l") + int field1439; @ObfuscatedSignature( - signature = "(Lcw;III)V" + signature = "(Lcc;III)V" ) RawPcmStream(RawSound var1, int var2, int var3, int var4) { super.sound = var1; this.start = var1.start; this.end = var1.end; - this.field1466 = var1.field1378; - this.field1457 = var2; - this.field1458 = var3; - this.field1459 = var4; - this.field1467 = 0; - this.method2569(); + this.field1435 = var1.field1352; + this.field1426 = var2; + this.field1427 = var3; + this.field1432 = var4; + this.field1428 = 0; + this.method2543(); } @ObfuscatedSignature( - signature = "(Lcw;II)V" + signature = "(Lcc;II)V" ) RawPcmStream(RawSound var1, int var2, int var3) { super.sound = var1; this.start = var1.start; this.end = var1.end; - this.field1466 = var1.field1378; - this.field1457 = var2; - this.field1458 = var3; - this.field1459 = 8192; - this.field1467 = 0; - this.method2569(); - } - - @ObfuscatedName("z") - void method2569() { - this.field1460 = this.field1458; - this.field1470 = method2692(this.field1458, this.field1459); - this.field1462 = method2566(this.field1458, this.field1459); + this.field1435 = var1.field1352; + this.field1426 = var2; + this.field1427 = var3; + this.field1432 = 8192; + this.field1428 = 0; + this.method2543(); } @ObfuscatedName("p") + void method2543() { + this.field1429 = this.field1427; + this.field1430 = method2552(this.field1427, this.field1432); + this.field1431 = method2693(this.field1427, this.field1432); + } + + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "()Ldt;" + signature = "()Ldl;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { return null; } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "()Ldt;" + signature = "()Ldl;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { return null; } - @ObfuscatedName("y") - protected int vmethod3963() { - return this.field1458 == 0 && this.field1465 == 0 ? 0 : 1; + @ObfuscatedName("x") + protected int vmethod3889() { + return this.field1427 == 0 && this.field1437 == 0 ? 0 : 1; } - @ObfuscatedName("w") + @ObfuscatedName("a") @Export("fill") public synchronized void fill(int[] var1, int var2, int var3) { - if (this.field1458 == 0 && this.field1465 == 0) { + if (this.field1427 == 0 && this.field1437 == 0) { this.skip(var3); } else { RawSound var4 = (RawSound)super.sound; @@ -117,163 +117,163 @@ public class RawPcmStream extends PcmStream { int var9 = var2; var3 += var2; - if (this.field1467 < 0) { - if (this.field1457 <= 0) { - this.method2579(); + if (this.field1428 < 0) { + if (this.field1426 <= 0) { + this.method2679(); this.remove(); return; } - this.field1467 = 0; + this.field1428 = 0; } - if (this.field1467 >= var7) { - if (this.field1457 >= 0) { - this.method2579(); + if (this.field1428 >= var7) { + if (this.field1426 >= 0) { + this.method2679(); this.remove(); return; } - this.field1467 = var7 - 1; + this.field1428 = var7 - 1; } if (this.numLoops < 0) { - if (this.field1466) { - if (this.field1457 < 0) { - var9 = this.method2598(var1, var2, var5, var3, var4.samples[this.start]); - if (this.field1467 >= var5) { + if (this.field1435) { + if (this.field1426 < 0) { + var9 = this.method2570(var1, var2, var5, var3, var4.samples[this.start]); + if (this.field1428 >= var5) { return; } - this.field1467 = var5 + var5 - 1 - this.field1467; - this.field1457 = -this.field1457; + this.field1428 = var5 + var5 - 1 - this.field1428; + this.field1426 = -this.field1426; } while (true) { - var9 = this.method2592(var1, var9, var6, var3, var4.samples[this.end - 1]); - if (this.field1467 < var6) { + var9 = this.method2569(var1, var9, var6, var3, var4.samples[this.end - 1]); + if (this.field1428 < var6) { return; } - this.field1467 = var6 + var6 - 1 - this.field1467; - this.field1457 = -this.field1457; - var9 = this.method2598(var1, var9, var5, var3, var4.samples[this.start]); - if (this.field1467 >= var5) { + this.field1428 = var6 + var6 - 1 - this.field1428; + this.field1426 = -this.field1426; + var9 = this.method2570(var1, var9, var5, var3, var4.samples[this.start]); + if (this.field1428 >= var5) { return; } - this.field1467 = var5 + var5 - 1 - this.field1467; - this.field1457 = -this.field1457; + this.field1428 = var5 + var5 - 1 - this.field1428; + this.field1426 = -this.field1426; } - } else if (this.field1457 < 0) { + } else if (this.field1426 < 0) { while (true) { - var9 = this.method2598(var1, var9, var5, var3, var4.samples[this.end - 1]); - if (this.field1467 >= var5) { + var9 = this.method2570(var1, var9, var5, var3, var4.samples[this.end - 1]); + if (this.field1428 >= var5) { return; } - this.field1467 = var6 - 1 - (var6 - 1 - this.field1467) % var8; + this.field1428 = var6 - 1 - (var6 - 1 - this.field1428) % var8; } } else { while (true) { - var9 = this.method2592(var1, var9, var6, var3, var4.samples[this.start]); - if (this.field1467 < var6) { + var9 = this.method2569(var1, var9, var6, var3, var4.samples[this.start]); + if (this.field1428 < var6) { return; } - this.field1467 = var5 + (this.field1467 - var5) % var8; + this.field1428 = var5 + (this.field1428 - var5) % var8; } } } else { if (this.numLoops > 0) { - if (this.field1466) { - label130: { - if (this.field1457 < 0) { - var9 = this.method2598(var1, var2, var5, var3, var4.samples[this.start]); - if (this.field1467 >= var5) { + if (this.field1435) { + label122: { + if (this.field1426 < 0) { + var9 = this.method2570(var1, var2, var5, var3, var4.samples[this.start]); + if (this.field1428 >= var5) { return; } - this.field1467 = var5 + var5 - 1 - this.field1467; - this.field1457 = -this.field1457; + this.field1428 = var5 + var5 - 1 - this.field1428; + this.field1426 = -this.field1426; if (--this.numLoops == 0) { - break label130; + break label122; } } do { - var9 = this.method2592(var1, var9, var6, var3, var4.samples[this.end - 1]); - if (this.field1467 < var6) { + var9 = this.method2569(var1, var9, var6, var3, var4.samples[this.end - 1]); + if (this.field1428 < var6) { return; } - this.field1467 = var6 + var6 - 1 - this.field1467; - this.field1457 = -this.field1457; + this.field1428 = var6 + var6 - 1 - this.field1428; + this.field1426 = -this.field1426; if (--this.numLoops == 0) { break; } - var9 = this.method2598(var1, var9, var5, var3, var4.samples[this.start]); - if (this.field1467 >= var5) { + var9 = this.method2570(var1, var9, var5, var3, var4.samples[this.start]); + if (this.field1428 >= var5) { return; } - this.field1467 = var5 + var5 - 1 - this.field1467; - this.field1457 = -this.field1457; + this.field1428 = var5 + var5 - 1 - this.field1428; + this.field1426 = -this.field1426; } while(--this.numLoops != 0); } } else { int var10; - if (this.field1457 < 0) { + if (this.field1426 < 0) { while (true) { - var9 = this.method2598(var1, var9, var5, var3, var4.samples[this.end - 1]); - if (this.field1467 >= var5) { + var9 = this.method2570(var1, var9, var5, var3, var4.samples[this.end - 1]); + if (this.field1428 >= var5) { return; } - var10 = (var6 - 1 - this.field1467) / var8; + var10 = (var6 - 1 - this.field1428) / var8; if (var10 >= this.numLoops) { - this.field1467 += var8 * this.numLoops; + this.field1428 += var8 * this.numLoops; this.numLoops = 0; break; } - this.field1467 += var8 * var10; + this.field1428 += var8 * var10; this.numLoops -= var10; } } else { while (true) { - var9 = this.method2592(var1, var9, var6, var3, var4.samples[this.start]); - if (this.field1467 < var6) { + var9 = this.method2569(var1, var9, var6, var3, var4.samples[this.start]); + if (this.field1428 < var6) { return; } - var10 = (this.field1467 - var5) / var8; + var10 = (this.field1428 - var5) / var8; if (var10 >= this.numLoops) { - this.field1467 -= var8 * this.numLoops; + this.field1428 -= var8 * this.numLoops; this.numLoops = 0; break; } - this.field1467 -= var8 * var10; + this.field1428 -= var8 * var10; this.numLoops -= var10; } } } } - if (this.field1457 < 0) { - this.method2598(var1, var9, 0, var3, 0); - if (this.field1467 < 0) { - this.field1467 = -1; - this.method2579(); + if (this.field1426 < 0) { + this.method2570(var1, var9, 0, var3, 0); + if (this.field1428 < 0) { + this.field1428 = -1; + this.method2679(); this.remove(); } } else { - this.method2592(var1, var9, var7, var3, 0); - if (this.field1467 >= var7) { - this.field1467 = var7; - this.method2579(); + this.method2569(var1, var9, var7, var3, 0); + if (this.field1428 >= var7) { + this.field1428 = var7; + this.method2679(); this.remove(); } } @@ -282,33 +282,33 @@ public class RawPcmStream extends PcmStream { } } - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("setNumLoops") public synchronized void setNumLoops(int var1) { this.numLoops = var1; } - @ObfuscatedName("k") + @ObfuscatedName("c") @Export("skip") public synchronized void skip(int var1) { - if (this.field1465 > 0) { - if (var1 >= this.field1465) { - if (this.field1458 == Integer.MIN_VALUE) { - this.field1458 = 0; - this.field1462 = 0; - this.field1470 = 0; - this.field1460 = 0; + if (this.field1437 > 0) { + if (var1 >= this.field1437) { + if (this.field1427 == Integer.MIN_VALUE) { + this.field1427 = 0; + this.field1431 = 0; + this.field1430 = 0; + this.field1429 = 0; this.remove(); - var1 = this.field1465; + var1 = this.field1437; } - this.field1465 = 0; - this.method2569(); + this.field1437 = 0; + this.method2543(); } else { - this.field1460 += this.field1456 * var1; - this.field1470 += this.field1469 * var1; - this.field1462 += this.field1468 * var1; - this.field1465 -= var1; + this.field1429 += this.field1436 * var1; + this.field1430 += this.field1438 * var1; + this.field1431 += this.field1439 * var1; + this.field1437 -= var1; } } @@ -321,179 +321,183 @@ public class RawPcmStream extends PcmStream { this.numLoops = 0; } - if (this.field1467 < 0) { - if (this.field1457 <= 0) { - this.method2579(); + if (this.field1428 < 0) { + if (this.field1426 <= 0) { + this.method2679(); this.remove(); return; } - this.field1467 = 0; + this.field1428 = 0; } - if (this.field1467 >= var5) { - if (this.field1457 >= 0) { - this.method2579(); + if (this.field1428 >= var5) { + if (this.field1426 >= 0) { + this.method2679(); this.remove(); return; } - this.field1467 = var5 - 1; + this.field1428 = var5 - 1; } - this.field1467 += this.field1457 * var1; + this.field1428 += this.field1426 * var1; if (this.numLoops < 0) { - if (!this.field1466) { - if (this.field1457 < 0) { - if (this.field1467 >= var3) { + if (!this.field1435) { + if (this.field1426 < 0) { + if (this.field1428 >= var3) { return; } - this.field1467 = var4 - 1 - (var4 - 1 - this.field1467) % var6; + this.field1428 = var4 - 1 - (var4 - 1 - this.field1428) % var6; } else { - if (this.field1467 < var4) { + if (this.field1428 < var4) { return; } - this.field1467 = var3 + (this.field1467 - var3) % var6; + this.field1428 = var3 + (this.field1428 - var3) % var6; } } else { - if (this.field1457 < 0) { - if (this.field1467 >= var3) { + if (this.field1426 < 0) { + if (this.field1428 >= var3) { return; } - this.field1467 = var3 + var3 - 1 - this.field1467; - this.field1457 = -this.field1457; + this.field1428 = var3 + var3 - 1 - this.field1428; + this.field1426 = -this.field1426; } - while (this.field1467 >= var4) { - this.field1467 = var4 + var4 - 1 - this.field1467; - this.field1457 = -this.field1457; - if (this.field1467 >= var3) { + while (this.field1428 >= var4) { + this.field1428 = var4 + var4 - 1 - this.field1428; + this.field1426 = -this.field1426; + if (this.field1428 >= var3) { return; } - this.field1467 = var3 + var3 - 1 - this.field1467; - this.field1457 = -this.field1457; + this.field1428 = var3 + var3 - 1 - this.field1428; + this.field1426 = -this.field1426; } } } else { if (this.numLoops > 0) { - if (this.field1466) { - label125: { - if (this.field1457 < 0) { - if (this.field1467 >= var3) { + if (this.field1435) { + label124: { + if (this.field1426 < 0) { + if (this.field1428 >= var3) { return; } - this.field1467 = var3 + var3 - 1 - this.field1467; - this.field1457 = -this.field1457; + this.field1428 = var3 + var3 - 1 - this.field1428; + this.field1426 = -this.field1426; if (--this.numLoops == 0) { - break label125; + break label124; } } do { - if (this.field1467 < var4) { + if (this.field1428 < var4) { return; } - this.field1467 = var4 + var4 - 1 - this.field1467; - this.field1457 = -this.field1457; + this.field1428 = var4 + var4 - 1 - this.field1428; + this.field1426 = -this.field1426; if (--this.numLoops == 0) { break; } - if (this.field1467 >= var3) { + if (this.field1428 >= var3) { return; } - this.field1467 = var3 + var3 - 1 - this.field1467; - this.field1457 = -this.field1457; + this.field1428 = var3 + var3 - 1 - this.field1428; + this.field1426 = -this.field1426; } while(--this.numLoops != 0); } } else { - int var7; - if (this.field1457 < 0) { - if (this.field1467 >= var3) { - return; - } + label156: { + int var7; + if (this.field1426 < 0) { + if (this.field1428 >= var3) { + return; + } - var7 = (var4 - 1 - this.field1467) / var6; - if (var7 < this.numLoops) { - this.field1467 += var6 * var7; + var7 = (var4 - 1 - this.field1428) / var6; + if (var7 >= this.numLoops) { + this.field1428 += var6 * this.numLoops; + this.numLoops = 0; + break label156; + } + + this.field1428 += var6 * var7; this.numLoops -= var7; - return; - } + } else { + if (this.field1428 < var4) { + return; + } - this.field1467 += var6 * this.numLoops; - this.numLoops = 0; - } else { - if (this.field1467 < var4) { - return; - } + var7 = (this.field1428 - var3) / var6; + if (var7 >= this.numLoops) { + this.field1428 -= var6 * this.numLoops; + this.numLoops = 0; + break label156; + } - var7 = (this.field1467 - var3) / var6; - if (var7 < this.numLoops) { - this.field1467 -= var6 * var7; + this.field1428 -= var6 * var7; this.numLoops -= var7; - return; } - this.field1467 -= var6 * this.numLoops; - this.numLoops = 0; + return; } } } - if (this.field1457 < 0) { - if (this.field1467 < 0) { - this.field1467 = -1; - this.method2579(); + if (this.field1426 < 0) { + if (this.field1428 < 0) { + this.field1428 = -1; + this.method2679(); this.remove(); } - } else if (this.field1467 >= var5) { - this.field1467 = var5; - this.method2579(); + } else if (this.field1428 >= var5) { + this.field1428 = var5; + this.method2679(); this.remove(); } } } - @ObfuscatedName("x") - public synchronized void method2572(int var1) { - this.method2574(var1 << 6, this.method2576()); - } - @ObfuscatedName("o") - synchronized void method2573(int var1) { - this.method2574(var1, this.method2576()); + public synchronized void method2578(int var1) { + this.method2551(var1 << 6, this.method2553()); } - @ObfuscatedName("e") - synchronized void method2574(int var1, int var2) { - this.field1458 = var1; - this.field1459 = var2; - this.field1465 = 0; - this.method2569(); + @ObfuscatedName("l") + synchronized void method2550(int var1) { + this.method2551(var1, this.method2553()); + } + + @ObfuscatedName("t") + synchronized void method2551(int var1, int var2) { + this.field1427 = var1; + this.field1432 = var2; + this.field1437 = 0; + this.method2543(); + } + + @ObfuscatedName("j") + public synchronized int method2609() { + return this.field1427 == Integer.MIN_VALUE ? 0 : this.field1427; } @ObfuscatedName("n") - public synchronized int method2575() { - return this.field1458 == Integer.MIN_VALUE ? 0 : this.field1458; + public synchronized int method2553() { + return this.field1432 < 0 ? -1 : this.field1432; } - @ObfuscatedName("c") - public synchronized int method2576() { - return this.field1459 < 0 ? -1 : this.field1459; - } - - @ObfuscatedName("s") - public synchronized void method2722(int var1) { + @ObfuscatedName("u") + public synchronized void method2554(int var1) { int var2 = ((RawSound)super.sound).samples.length << 8; if (var1 < -1) { var1 = -1; @@ -503,207 +507,257 @@ public class RawPcmStream extends PcmStream { var1 = var2; } - this.field1467 = var1; + this.field1428 = var1; } - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "(Z)V", garbageValue = "1" ) - public synchronized void method2578() { - this.field1457 = (this.field1457 ^ this.field1457 >> 31) + (this.field1457 >>> 31); - this.field1457 = -this.field1457; + public synchronized void method2555() { + this.field1426 = (this.field1426 ^ this.field1426 >> 31) + (this.field1426 >>> 31); + this.field1426 = -this.field1426; } - @ObfuscatedName("m") - void method2579() { - if (this.field1465 != 0) { - if (this.field1458 == Integer.MIN_VALUE) { - this.field1458 = 0; + @ObfuscatedName("h") + void method2679() { + if (this.field1437 != 0) { + if (this.field1427 == Integer.MIN_VALUE) { + this.field1427 = 0; } - this.field1465 = 0; - this.method2569(); + this.field1437 = 0; + this.method2543(); } } - @ObfuscatedName("v") - public synchronized void method2580(int var1, int var2) { - this.method2581(var1, var2, this.method2576()); + @ObfuscatedName("m") + public synchronized void method2557(int var1, int var2) { + this.method2668(var1, var2, this.method2553()); } - @ObfuscatedName("q") - public synchronized void method2581(int var1, int var2, int var3) { + @ObfuscatedName("aa") + public synchronized void method2668(int var1, int var2, int var3) { if (var1 == 0) { - this.method2574(var2, var3); + this.method2551(var2, var3); } else { - int var4 = method2692(var2, var3); - int var5 = method2566(var2, var3); - if (var4 == this.field1470 && var5 == this.field1462) { - this.field1465 = 0; + int var4 = method2552(var2, var3); + int var5 = method2693(var2, var3); + if (var4 == this.field1430 && var5 == this.field1431) { + this.field1437 = 0; } else { - int var6 = var2 - this.field1460; - if (this.field1460 - var2 > var6) { - var6 = this.field1460 - var2; + int var6 = var2 - this.field1429; + if (this.field1429 - var2 > var6) { + var6 = this.field1429 - var2; } - if (var4 - this.field1470 > var6) { - var6 = var4 - this.field1470; + if (var4 - this.field1430 > var6) { + var6 = var4 - this.field1430; } - if (this.field1470 - var4 > var6) { - var6 = this.field1470 - var4; + if (this.field1430 - var4 > var6) { + var6 = this.field1430 - var4; } - if (var5 - this.field1462 > var6) { - var6 = var5 - this.field1462; + if (var5 - this.field1431 > var6) { + var6 = var5 - this.field1431; } - if (this.field1462 - var5 > var6) { - var6 = this.field1462 - var5; + if (this.field1431 - var5 > var6) { + var6 = this.field1431 - var5; } if (var1 > var6) { var1 = var6; } - this.field1465 = var1; - this.field1458 = var2; - this.field1459 = var3; - this.field1456 = (var2 - this.field1460) / var1; - this.field1469 = (var4 - this.field1470) / var1; - this.field1468 = (var5 - this.field1462) / var1; + this.field1437 = var1; + this.field1427 = var2; + this.field1432 = var3; + this.field1436 = (var2 - this.field1429) / var1; + this.field1438 = (var4 - this.field1430) / var1; + this.field1439 = (var5 - this.field1431) / var1; } } } - @ObfuscatedName("l") - public synchronized void method2582(int var1) { + @ObfuscatedName("av") + public synchronized void method2559(int var1) { if (var1 == 0) { - this.method2573(0); + this.method2550(0); this.remove(); - } else if (this.field1470 == 0 && this.field1462 == 0) { - this.field1465 = 0; - this.field1458 = 0; - this.field1460 = 0; + } else if (this.field1430 == 0 && this.field1431 == 0) { + this.field1437 = 0; + this.field1427 = 0; + this.field1429 = 0; this.remove(); } else { - int var2 = -this.field1460; - if (this.field1460 > var2) { - var2 = this.field1460; + int var2 = -this.field1429; + if (this.field1429 > var2) { + var2 = this.field1429; } - if (-this.field1470 > var2) { - var2 = -this.field1470; + if (-this.field1430 > var2) { + var2 = -this.field1430; } - if (this.field1470 > var2) { - var2 = this.field1470; + if (this.field1430 > var2) { + var2 = this.field1430; } - if (-this.field1462 > var2) { - var2 = -this.field1462; + if (-this.field1431 > var2) { + var2 = -this.field1431; } - if (this.field1462 > var2) { - var2 = this.field1462; + if (this.field1431 > var2) { + var2 = this.field1431; } if (var1 > var2) { var1 = var2; } - this.field1465 = var1; - this.field1458 = Integer.MIN_VALUE; - this.field1456 = -this.field1460 / var1; - this.field1469 = -this.field1470 / var1; - this.field1468 = -this.field1462 / var1; + this.field1437 = var1; + this.field1427 = Integer.MIN_VALUE; + this.field1436 = -this.field1429 / var1; + this.field1438 = -this.field1430 / var1; + this.field1439 = -this.field1431 / var1; } } - @ObfuscatedName("aa") - public synchronized void method2679(int var1) { - if (this.field1457 < 0) { - this.field1457 = -var1; + @ObfuscatedName("ay") + public synchronized void method2615(int var1) { + if (this.field1426 < 0) { + this.field1426 = -var1; } else { - this.field1457 = var1; + this.field1426 = var1; } } - @ObfuscatedName("ab") - public synchronized int method2701() { - return this.field1457 < 0 ? -this.field1457 : this.field1457; + @ObfuscatedName("ag") + public synchronized int method2561() { + return this.field1426 < 0 ? -this.field1426 : this.field1426; } - @ObfuscatedName("ar") - public boolean method2585() { - return this.field1467 < 0 || this.field1467 >= ((RawSound)super.sound).samples.length << 8; + @ObfuscatedName("ae") + public boolean method2653() { + return this.field1428 < 0 || this.field1428 >= ((RawSound)super.sound).samples.length << 8; } - @ObfuscatedName("ac") - public boolean method2686() { - return this.field1465 != 0; + @ObfuscatedName("ad") + public boolean method2563() { + return this.field1437 != 0; } - @ObfuscatedName("az") - int method2592(int[] var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("aj") + int method2569(int[] var1, int var2, int var3, int var4, int var5) { while (true) { - if (this.field1465 > 0) { - int var6 = var2 + this.field1465; + if (this.field1437 > 0) { + int var6 = var2 + this.field1437; if (var6 > var4) { var6 = var4; } - this.field1465 += var2; - if (this.field1457 == 256 && (this.field1467 & 255) == 0) { - if (PcmPlayer.PcmPlayer_stereo) { - var2 = method2673(0, ((RawSound)super.sound).samples, var1, this.field1467, var2, this.field1470, this.field1462, this.field1469, this.field1468, 0, var6, var3, this); + this.field1437 += var2; + if (this.field1426 == 256 && (this.field1428 & 255) == 0) { + if (SoundCache.PcmPlayer_stereo) { + var2 = method2581(0, ((RawSound)super.sound).samples, var1, this.field1428, var2, this.field1430, this.field1431, this.field1438, this.field1439, 0, var6, var3, this); } else { - var2 = method2603(((RawSound)super.sound).samples, var1, this.field1467, var2, this.field1460, this.field1456, 0, var6, var3, this); + var2 = method2614(((RawSound)super.sound).samples, var1, this.field1428, var2, this.field1429, this.field1436, 0, var6, var3, this); } - } else if (PcmPlayer.PcmPlayer_stereo) { - var2 = method2604(0, 0, ((RawSound)super.sound).samples, var1, this.field1467, var2, this.field1470, this.field1462, this.field1469, this.field1468, 0, var6, var3, this, this.field1457, var5); + } else if (SoundCache.PcmPlayer_stereo) { + var2 = method2585(0, 0, ((RawSound)super.sound).samples, var1, this.field1428, var2, this.field1430, this.field1431, this.field1438, this.field1439, 0, var6, var3, this, this.field1426, var5); } else { - var2 = method2607(0, 0, ((RawSound)super.sound).samples, var1, this.field1467, var2, this.field1460, this.field1456, 0, var6, var3, this, this.field1457, var5); + var2 = method2584(0, 0, ((RawSound)super.sound).samples, var1, this.field1428, var2, this.field1429, this.field1436, 0, var6, var3, this, this.field1426, var5); } - this.field1465 -= var2; - if (this.field1465 != 0) { + this.field1437 -= var2; + if (this.field1437 != 0) { return var2; } - if (!this.method2594()) { + if (!this.method2571()) { continue; } return var4; } - if (this.field1457 == 256 && (this.field1467 & 255) == 0) { - if (PcmPlayer.PcmPlayer_stereo) { - return method2596(0, ((RawSound)super.sound).samples, var1, this.field1467, var2, this.field1470, this.field1462, 0, var4, var3, this); + if (this.field1426 == 256 && (this.field1428 & 255) == 0) { + if (SoundCache.PcmPlayer_stereo) { + return method2573(0, ((RawSound)super.sound).samples, var1, this.field1428, var2, this.field1430, this.field1431, 0, var4, var3, this); } - return method2640(((RawSound)super.sound).samples, var1, this.field1467, var2, this.field1460, 0, var4, var3, this); + return method2572(((RawSound)super.sound).samples, var1, this.field1428, var2, this.field1429, 0, var4, var3, this); } - if (PcmPlayer.PcmPlayer_stereo) { - return method2600(0, 0, ((RawSound)super.sound).samples, var1, this.field1467, var2, this.field1470, this.field1462, 0, var4, var3, this, this.field1457, var5); + if (SoundCache.PcmPlayer_stereo) { + return method2577(0, 0, ((RawSound)super.sound).samples, var1, this.field1428, var2, this.field1430, this.field1431, 0, var4, var3, this, this.field1426, var5); } - return method2599(0, 0, ((RawSound)super.sound).samples, var1, this.field1467, var2, this.field1460, 0, var4, var3, this, this.field1457, var5); + return method2576(0, 0, ((RawSound)super.sound).samples, var1, this.field1428, var2, this.field1429, 0, var4, var3, this, this.field1426, var5); + } + } + + @ObfuscatedName("ax") + int method2570(int[] var1, int var2, int var3, int var4, int var5) { + while (true) { + if (this.field1437 > 0) { + int var6 = var2 + this.field1437; + if (var6 > var4) { + var6 = var4; + } + + this.field1437 += var2; + if (this.field1426 == -256 && (this.field1428 & 255) == 0) { + if (SoundCache.PcmPlayer_stereo) { + var2 = method2556(0, ((RawSound)super.sound).samples, var1, this.field1428, var2, this.field1430, this.field1431, this.field1438, this.field1439, 0, var6, var3, this); + } else { + var2 = method2542(((RawSound)super.sound).samples, var1, this.field1428, var2, this.field1429, this.field1436, 0, var6, var3, this); + } + } else if (SoundCache.PcmPlayer_stereo) { + var2 = method2587(0, 0, ((RawSound)super.sound).samples, var1, this.field1428, var2, this.field1430, this.field1431, this.field1438, this.field1439, 0, var6, var3, this, this.field1426, var5); + } else { + var2 = method2568(0, 0, ((RawSound)super.sound).samples, var1, this.field1428, var2, this.field1429, this.field1436, 0, var6, var3, this, this.field1426, var5); + } + + this.field1437 -= var2; + if (this.field1437 != 0) { + return var2; + } + + if (!this.method2571()) { + continue; + } + + return var4; + } + + if (this.field1426 == -256 && (this.field1428 & 255) == 0) { + if (SoundCache.PcmPlayer_stereo) { + return method2575(0, ((RawSound)super.sound).samples, var1, this.field1428, var2, this.field1430, this.field1431, 0, var4, var3, this); + } + + return method2689(((RawSound)super.sound).samples, var1, this.field1428, var2, this.field1429, 0, var4, var3, this); + } + + if (SoundCache.PcmPlayer_stereo) { + return method2579(0, 0, ((RawSound)super.sound).samples, var1, this.field1428, var2, this.field1430, this.field1431, 0, var4, var3, this, this.field1426, var5); + } + + return method2629(0, 0, ((RawSound)super.sound).samples, var1, this.field1428, var2, this.field1429, 0, var4, var3, this, this.field1426, var5); } } @ObfuscatedName("at") - int vmethod2741() { - int var1 = this.field1460 * 3 >> 6; + int vmethod2716() { + int var1 = this.field1429 * 3 >> 6; var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); if (this.numLoops == 0) { - var1 -= var1 * this.field1467 / (((RawSound)super.sound).samples.length << 8); + var1 -= var1 * this.field1428 / (((RawSound)super.sound).samples.length << 8); } else if (this.numLoops >= 0) { var1 -= var1 * this.start / ((RawSound)super.sound).samples.length; } @@ -711,59 +765,9 @@ public class RawPcmStream extends PcmStream { return var1 > 255 ? 255 : var1; } - @ObfuscatedName("ae") - int method2598(int[] var1, int var2, int var3, int var4, int var5) { - while (true) { - if (this.field1465 > 0) { - int var6 = var2 + this.field1465; - if (var6 > var4) { - var6 = var4; - } - - this.field1465 += var2; - if (this.field1457 == -256 && (this.field1467 & 255) == 0) { - if (PcmPlayer.PcmPlayer_stereo) { - var2 = method2606(0, ((RawSound)super.sound).samples, var1, this.field1467, var2, this.field1470, this.field1462, this.field1469, this.field1468, 0, var6, var3, this); - } else { - var2 = method2605(((RawSound)super.sound).samples, var1, this.field1467, var2, this.field1460, this.field1456, 0, var6, var3, this); - } - } else if (PcmPlayer.PcmPlayer_stereo) { - var2 = method2610(0, 0, ((RawSound)super.sound).samples, var1, this.field1467, var2, this.field1470, this.field1462, this.field1469, this.field1468, 0, var6, var3, this, this.field1457, var5); - } else { - var2 = method2705(0, 0, ((RawSound)super.sound).samples, var1, this.field1467, var2, this.field1460, this.field1456, 0, var6, var3, this, this.field1457, var5); - } - - this.field1465 -= var2; - if (this.field1465 != 0) { - return var2; - } - - if (!this.method2594()) { - continue; - } - - return var4; - } - - if (this.field1457 == -256 && (this.field1467 & 255) == 0) { - if (PcmPlayer.PcmPlayer_stereo) { - return method2624(0, ((RawSound)super.sound).samples, var1, this.field1467, var2, this.field1470, this.field1462, 0, var4, var3, this); - } - - return method2597(((RawSound)super.sound).samples, var1, this.field1467, var2, this.field1460, 0, var4, var3, this); - } - - if (PcmPlayer.PcmPlayer_stereo) { - return method2650(0, 0, ((RawSound)super.sound).samples, var1, this.field1467, var2, this.field1470, this.field1462, 0, var4, var3, this, this.field1457, var5); - } - - return method2612(0, 0, ((RawSound)super.sound).samples, var1, this.field1467, var2, this.field1460, 0, var4, var3, this, this.field1457, var5); - } - } - - @ObfuscatedName("aj") - boolean method2594() { - int var1 = this.field1458; + @ObfuscatedName("af") + boolean method2571() { + int var1 = this.field1427; int var2; int var3; if (var1 == Integer.MIN_VALUE) { @@ -771,97 +775,97 @@ public class RawPcmStream extends PcmStream { var2 = 0; var1 = 0; } else { - var2 = method2692(var1, this.field1459); - var3 = method2566(var1, this.field1459); + var2 = method2552(var1, this.field1432); + var3 = method2693(var1, this.field1432); } - if (var1 == this.field1460 && var2 == this.field1470 && var3 == this.field1462) { - if (this.field1458 == Integer.MIN_VALUE) { - this.field1458 = 0; - this.field1462 = 0; - this.field1470 = 0; - this.field1460 = 0; + if (var1 == this.field1429 && var2 == this.field1430 && var3 == this.field1431) { + if (this.field1427 == Integer.MIN_VALUE) { + this.field1427 = 0; + this.field1431 = 0; + this.field1430 = 0; + this.field1429 = 0; this.remove(); return true; } else { - this.method2569(); + this.method2543(); return false; } } else { - if (this.field1460 < var1) { - this.field1456 = 1; - this.field1465 = var1 - this.field1460; - } else if (this.field1460 > var1) { - this.field1456 = -1; - this.field1465 = this.field1460 - var1; + if (this.field1429 < var1) { + this.field1436 = 1; + this.field1437 = var1 - this.field1429; + } else if (this.field1429 > var1) { + this.field1436 = -1; + this.field1437 = this.field1429 - var1; } else { - this.field1456 = 0; + this.field1436 = 0; } - if (this.field1470 < var2) { - this.field1469 = 1; - if (this.field1465 == 0 || this.field1465 > var2 - this.field1470) { - this.field1465 = var2 - this.field1470; + if (this.field1430 < var2) { + this.field1438 = 1; + if (this.field1437 == 0 || this.field1437 > var2 - this.field1430) { + this.field1437 = var2 - this.field1430; } - } else if (this.field1470 > var2) { - this.field1469 = -1; - if (this.field1465 == 0 || this.field1465 > this.field1470 - var2) { - this.field1465 = this.field1470 - var2; + } else if (this.field1430 > var2) { + this.field1438 = -1; + if (this.field1437 == 0 || this.field1437 > this.field1430 - var2) { + this.field1437 = this.field1430 - var2; } } else { - this.field1469 = 0; + this.field1438 = 0; } - if (this.field1462 < var3) { - this.field1468 = 1; - if (this.field1465 == 0 || this.field1465 > var3 - this.field1462) { - this.field1465 = var3 - this.field1462; + if (this.field1431 < var3) { + this.field1439 = 1; + if (this.field1437 == 0 || this.field1437 > var3 - this.field1431) { + this.field1437 = var3 - this.field1431; } - } else if (this.field1462 > var3) { - this.field1468 = -1; - if (this.field1465 == 0 || this.field1465 > this.field1462 - var3) { - this.field1465 = this.field1462 - var3; + } else if (this.field1431 > var3) { + this.field1439 = -1; + if (this.field1437 == 0 || this.field1437 > this.field1431 - var3) { + this.field1437 = this.field1431 - var3; } } else { - this.field1468 = 0; + this.field1439 = 0; } return false; } } - @ObfuscatedName("u") - static int method2692(int var0, int var1) { + @ObfuscatedName("f") + static int method2552(int var0, int var1) { return var1 < 0 ? var0 : (int)((double)var0 * Math.sqrt((double)(16384 - var1) * 1.220703125E-4D) + 0.5D); } - @ObfuscatedName("f") - static int method2566(int var0, int var1) { + @ObfuscatedName("i") + static int method2693(int var0, int var1) { return var1 < 0 ? -var0 : (int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D); } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Lcw;II)Lds;" + signature = "(Lcc;II)Ldg;" ) @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)(Messages.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)(DirectByteArrayCopier.field2490 * 334942784)), var2 << 6) : null; } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lcw;III)Lds;" + signature = "(Lcc;III)Ldg;" ) - public static RawPcmStream method2568(RawSound var0, int var1, int var2, int var3) { + public static RawPcmStream method2582(RawSound var0, int var1, int var2, int var3) { return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, var1, var2, var3) : null; } @ObfuscatedName("ap") @ObfuscatedSignature( - signature = "([B[IIIIIIILds;)I" + signature = "([B[IIIIIIILdg;)I" ) - static int method2640(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + static int method2572(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { var2 >>= 8; var7 >>= 8; var4 <<= 2; @@ -884,15 +888,15 @@ public class RawPcmStream extends PcmStream { var10001 = var3++; } - var8.field1467 = var2 << 8; + var8.field1428 = var2 << 8; return var3; } - @ObfuscatedName("an") + @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(I[B[IIIIIIIILds;)I" + signature = "(I[B[IIIIIIIILdg;)I" ) - static int method2596(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { + static int method2573(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { var3 >>= 8; var9 >>= 8; var5 <<= 2; @@ -935,15 +939,15 @@ public class RawPcmStream extends PcmStream { var10001 = var4++; } - var10.field1467 = var3 << 8; + var10.field1428 = var3 << 8; return var4 >> 1; } - @ObfuscatedName("al") + @ObfuscatedName("am") @ObfuscatedSignature( - signature = "([B[IIIIIIILds;)I" + signature = "([B[IIIIIIILdg;)I" ) - static int method2597(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + static int method2689(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { var2 >>= 8; var7 >>= 8; var4 <<= 2; @@ -966,15 +970,15 @@ public class RawPcmStream extends PcmStream { var10001 = var3++; } - var8.field1467 = var2 << 8; + var8.field1428 = var2 << 8; return var3; } - @ObfuscatedName("ay") + @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "(I[B[IIIIIIIILds;)I" + signature = "(I[B[IIIIIIIILdg;)I" ) - static int method2624(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { + static int method2575(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { var3 >>= 8; var9 >>= 8; var5 <<= 2; @@ -1017,15 +1021,15 @@ public class RawPcmStream extends PcmStream { var10001 = var4++; } - var10.field1467 = var3 << 8; + var10.field1428 = var3 << 8; return var4 >> 1; } - @ObfuscatedName("ax") + @ObfuscatedName("bj") @ObfuscatedSignature( - signature = "(II[B[IIIIIIILds;II)I" + signature = "(II[B[IIIIIIILdg;II)I" ) - static int method2599(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 method2576(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 257) / var11) > var8) { var7 = var8; } @@ -1050,15 +1054,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6; } - var10.field1467 = var4; + var10.field1428 = var4; return var5; } - @ObfuscatedName("au") + @ObfuscatedName("bg") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIILds;II)I" + signature = "(II[B[IIIIIIIILdg;II)I" ) - static int method2600(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 method2577(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { var8 = var9; } @@ -1092,15 +1096,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += var0 * var7 >> 6; } - var11.field1467 = var4; + var11.field1428 = var4; return var5 >> 1; } - @ObfuscatedName("as") + @ObfuscatedName("bw") @ObfuscatedSignature( - signature = "(II[B[IIIIIIILds;II)I" + signature = "(II[B[IIIIIIILdg;II)I" ) - static int method2612(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 method2629(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { if (var11 == 0 || (var7 = var5 + (var11 + (var9 + 256 - var4)) / var11) > var8) { var7 = var8; } @@ -1125,15 +1129,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; } - var10.field1467 = var4; + var10.field1428 = var4; return var5; } - @ObfuscatedName("ah") + @ObfuscatedName("bk") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIILds;II)I" + signature = "(II[B[IIIIIIIILdg;II)I" ) - static int method2650(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 method2579(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { var8 = var9; } @@ -1165,15 +1169,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += var0 * var7 >> 6; } - var11.field1467 = var4; + var11.field1428 = var4; return var5 >> 1; } - @ObfuscatedName("bi") + @ObfuscatedName("bl") @ObfuscatedSignature( - signature = "([B[IIIIIIIILds;)I" + signature = "([B[IIIIIIIILdg;)I" ) - static int method2603(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + static int method2614(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; @@ -1182,8 +1186,8 @@ public class RawPcmStream extends PcmStream { var6 = var7; } - var9.field1470 += var9.field1469 * (var6 - var3); - var9.field1462 += var9.field1468 * (var6 - var3); + var9.field1430 += var9.field1438 * (var6 - var3); + var9.field1431 += var9.field1439 * (var6 - var3); int var10001; for (var6 -= 3; var3 < var6; var4 += var5) { @@ -1205,16 +1209,16 @@ public class RawPcmStream extends PcmStream { var1[var10001] += var0[var2++] * var4; } - var9.field1460 = var4 >> 2; - var9.field1467 = var2 << 8; + var9.field1429 = var4 >> 2; + var9.field1428 = var2 << 8; return var3; } - @ObfuscatedName("bo") + @ObfuscatedName("bq") @ObfuscatedSignature( - signature = "(I[B[IIIIIIIIIILds;)I" + signature = "(I[B[IIIIIIIIIILdg;)I" ) - static int method2673(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 method2581(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { var3 >>= 8; var11 >>= 8; var5 <<= 2; @@ -1225,7 +1229,7 @@ public class RawPcmStream extends PcmStream { var9 = var10; } - var12.field1460 += var12.field1456 * (var9 - var4); + var12.field1429 += var12.field1436 * (var9 - var4); var4 <<= 1; var9 <<= 1; @@ -1270,17 +1274,17 @@ public class RawPcmStream extends PcmStream { var2[var10001] += var13 * var6; } - var12.field1470 = var5 >> 2; - var12.field1462 = var6 >> 2; - var12.field1467 = var3 << 8; + var12.field1430 = var5 >> 2; + var12.field1431 = var6 >> 2; + var12.field1428 = var3 << 8; return var4 >> 1; } @ObfuscatedName("bx") @ObfuscatedSignature( - signature = "([B[IIIIIIIILds;)I" + signature = "([B[IIIIIIIILdg;)I" ) - static int method2605(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + static int method2542(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; @@ -1289,8 +1293,8 @@ public class RawPcmStream extends PcmStream { var6 = var7; } - var9.field1470 += var9.field1469 * (var6 - var3); - var9.field1462 += var9.field1468 * (var6 - var3); + var9.field1430 += var9.field1438 * (var6 - var3); + var9.field1431 += var9.field1439 * (var6 - var3); int var10001; for (var6 -= 3; var3 < var6; var4 += var5) { @@ -1312,16 +1316,16 @@ public class RawPcmStream extends PcmStream { var1[var10001] += var0[var2--] * var4; } - var9.field1460 = var4 >> 2; - var9.field1467 = var2 << 8; + var9.field1429 = var4 >> 2; + var9.field1428 = var2 << 8; return var3; } - @ObfuscatedName("bu") + @ObfuscatedName("bc") @ObfuscatedSignature( - signature = "(I[B[IIIIIIIIIILds;)I" + signature = "(I[B[IIIIIIIIIILdg;)I" ) - static int method2606(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 method2556(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { var3 >>= 8; var11 >>= 8; var5 <<= 2; @@ -1332,7 +1336,7 @@ public class RawPcmStream extends PcmStream { var9 = var10; } - var12.field1460 += var12.field1456 * (var9 - var4); + var12.field1429 += var12.field1436 * (var9 - var4); var4 <<= 1; var9 <<= 1; @@ -1377,19 +1381,19 @@ public class RawPcmStream extends PcmStream { var2[var10001] += var13 * var6; } - var12.field1470 = var5 >> 2; - var12.field1462 = var6 >> 2; - var12.field1467 = var3 << 8; + var12.field1430 = var5 >> 2; + var12.field1431 = var6 >> 2; + var12.field1428 = var3 << 8; return var4 >> 1; } - @ObfuscatedName("bd") + @ObfuscatedName("by") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIILds;II)I" + signature = "(II[B[IIIIIIIILdg;II)I" ) - static int method2607(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.field1470 -= var11.field1469 * var5; - var11.field1462 -= var11.field1468 * var5; + static int method2584(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { + var11.field1430 -= var11.field1438 * var5; + var11.field1431 -= var11.field1439 * var5; if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { var8 = var9; } @@ -1416,19 +1420,19 @@ public class RawPcmStream extends PcmStream { var6 += var7; } - var11.field1470 += var11.field1469 * var5; - var11.field1462 += var11.field1468 * var5; - var11.field1460 = var6; - var11.field1467 = var4; + var11.field1430 += var11.field1438 * var5; + var11.field1431 += var11.field1439 * var5; + var11.field1429 = var6; + var11.field1428 = var4; return var5; } - @ObfuscatedName("bn") + @ObfuscatedName("bz") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIIIILds;II)I" + signature = "(II[B[IIIIIIIIIILdg;II)I" ) - static int method2604(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.field1460 -= var5 * var13.field1456; + static int method2585(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) { + var13.field1429 -= var5 * var13.field1436; if (var14 == 0 || (var10 = var5 + (var12 - var4 + var14 - 257) / var14) > var11) { var10 = var11; } @@ -1467,20 +1471,20 @@ public class RawPcmStream extends PcmStream { } var5 >>= 1; - var13.field1460 += var13.field1456 * var5; - var13.field1470 = var6; - var13.field1462 = var7; - var13.field1467 = var4; + var13.field1429 += var13.field1436 * var5; + var13.field1430 = var6; + var13.field1431 = var7; + var13.field1428 = var4; return var5; } - @ObfuscatedName("bj") + @ObfuscatedName("bm") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIILds;II)I" + signature = "(II[B[IIIIIIIILdg;II)I" ) - static int method2705(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.field1470 -= var11.field1469 * var5; - var11.field1462 -= var11.field1468 * var5; + static int method2568(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { + var11.field1430 -= var11.field1438 * var5; + var11.field1431 -= var11.field1439 * var5; if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { var8 = var9; } @@ -1507,19 +1511,19 @@ public class RawPcmStream extends PcmStream { var6 += var7; } - var11.field1470 += var11.field1469 * var5; - var11.field1462 += var11.field1468 * var5; - var11.field1460 = var6; - var11.field1467 = var4; + var11.field1430 += var11.field1438 * var5; + var11.field1431 += var11.field1439 * var5; + var11.field1429 = var6; + var11.field1428 = var4; return var5; } - @ObfuscatedName("bm") + @ObfuscatedName("bo") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIIIILds;II)I" + signature = "(II[B[IIIIIIIIIILdg;II)I" ) - static int method2610(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.field1460 -= var5 * var13.field1456; + static int method2587(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) { + var13.field1429 -= var5 * var13.field1436; if (var14 == 0 || (var10 = var5 + (var12 + 256 - var4 + var14) / var14) > var11) { var10 = var11; } @@ -1556,10 +1560,10 @@ public class RawPcmStream extends PcmStream { } var5 >>= 1; - var13.field1460 += var13.field1456 * var5; - var13.field1470 = var6; - var13.field1462 = var7; - var13.field1467 = var4; + var13.field1429 += var13.field1436 * var5; + var13.field1430 = var6; + var13.field1431 = var7; + var13.field1428 = var4; return var5; } } diff --git a/runescape-client/src/main/java/RawSound.java b/runescape-client/src/main/java/RawSound.java index 114ab14136..a365fda282 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("cw") +@ObfuscatedName("cc") @Implements("RawSound") public class RawSound extends AbstractSound { - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("sampleRate") public int sampleRate; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("samples") public byte[] samples; - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("start") public int start; - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("end") int end; - @ObfuscatedName("z") - public boolean field1378; + @ObfuscatedName("p") + public boolean field1352; 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.field1378 = var5; + this.field1352 = var5; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Ldn;)Lcw;" + signature = "(Ldr;)Lcc;" ) @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 1f028b4bf9..46c131034d 100644 --- a/runescape-client/src/main/java/ReflectionCheck.java +++ b/runescape-client/src/main/java/ReflectionCheck.java @@ -6,71 +6,55 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ce") +@ObfuscatedName("dn") @Implements("ReflectionCheck") public class ReflectionCheck extends Node { - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 200973425 + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "Lko;" ) - @Export("id") - int id; + @Export("ItemDefinition_fontPlain11") + static Font ItemDefinition_fontPlain11; + @ObfuscatedName("m") + @Export("userHomeDirectory") + static String userHomeDirectory; + @ObfuscatedName("mp") + @ObfuscatedGetter( + intValue = -942024519 + ) + @Export("selectedSpellFlags") + static int selectedSpellFlags; @ObfuscatedName("f") @Export("intReplaceValues") int[] intReplaceValues; - @ObfuscatedName("b") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 648866297 + intValue = -1153531937 + ) + @Export("id") + int id; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = 1226139147 ) @Export("size") int size; - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("operations") int[] operations; - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("creationErrors") int[] creationErrors; - @ObfuscatedName("p") + @ObfuscatedName("b") @Export("fields") Field[] fields; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("methods") Method[] methods; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("arguments") byte[][][] arguments; ReflectionCheck() { } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(IIIIB)V", - garbageValue = "-15" - ) - static final void method2316(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) { - class51.field423[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]; - } - } - } - } - - } } diff --git a/runescape-client/src/main/java/RouteStrategy.java b/runescape-client/src/main/java/RouteStrategy.java index a6e0162a67..16372facda 100644 --- a/runescape-client/src/main/java/RouteStrategy.java +++ b/runescape-client/src/main/java/RouteStrategy.java @@ -4,40 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fg") +@ObfuscatedName("fx") @Implements("RouteStrategy") public abstract class RouteStrategy { - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1683670831 - ) - static int field2114; - @ObfuscatedName("fv") - @ObfuscatedGetter( - longValue = -7982817211457785639L - ) - static long field2110; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 1694860109 + intValue = 1026996041 ) @Export("approxDestinationX") public int approxDestinationX; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -279352193 + intValue = 229527517 ) @Export("approxDestinationY") public int approxDestinationY; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1604762731 + intValue = 309902599 ) @Export("approxDestinationSizeX") public int approxDestinationSizeX; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 368404493 + intValue = 762948669 ) @Export("approxDestinationSizeY") public int approxDestinationSizeY; @@ -45,59 +35,86 @@ public abstract class RouteStrategy { protected RouteStrategy() { } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(IIILfh;B)Z", - garbageValue = "-103" + signature = "(IIILfp;I)Z", + garbageValue = "1339159810" ) @Export("hasArrived") - protected abstract boolean hasArrived(int var1, int var2, int var3, CollisionMap var4); + public abstract boolean hasArrived(int var1, int var2, int var3, CollisionMap var4); - @ObfuscatedName("u") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(IIB)Z", - garbageValue = "34" + signature = "(Ljava/lang/CharSequence;I)[B", + garbageValue = "959122064" ) - static boolean method3638(int var0, int var1) { - return var0 != 4 || var1 < 8; - } + public static byte[] method3566(CharSequence var0) { + int var1 = var0.length(); + byte[] var2 = new byte[var1]; - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "(I)Ljava/lang/String;", - garbageValue = "62216772" - ) - static String method3639() { - return UserComparator10.clientPreferences.hideUsername ? PlayerType.method4212(Login.Login_username) : Login.Login_username; - } + for (int var3 = 0; var3 < var1; ++var3) { + char var4 = var0.charAt(var3); + if (var4 > 0 && var4 < 128 || var4 >= 160 && var4 <= 255) { + var2[var3] = (byte)var4; + } else if (var4 == 8364) { + var2[var3] = -128; + } else if (var4 == 8218) { + var2[var3] = -126; + } else if (var4 == 402) { + var2[var3] = -125; + } else if (var4 == 8222) { + var2[var3] = -124; + } else if (var4 == 8230) { + var2[var3] = -123; + } else if (var4 == 8224) { + var2[var3] = -122; + } else if (var4 == 8225) { + var2[var3] = -121; + } else if (var4 == 710) { + var2[var3] = -120; + } else if (var4 == 8240) { + var2[var3] = -119; + } else if (var4 == 352) { + var2[var3] = -118; + } else if (var4 == 8249) { + var2[var3] = -117; + } else if (var4 == 338) { + var2[var3] = -116; + } else if (var4 == 381) { + var2[var3] = -114; + } else if (var4 == 8216) { + var2[var3] = -111; + } else if (var4 == 8217) { + var2[var3] = -110; + } else if (var4 == 8220) { + var2[var3] = -109; + } else if (var4 == 8221) { + var2[var3] = -108; + } else if (var4 == 8226) { + var2[var3] = -107; + } else if (var4 == 8211) { + var2[var3] = -106; + } else if (var4 == 8212) { + var2[var3] = -105; + } else if (var4 == 732) { + var2[var3] = -104; + } else if (var4 == 8482) { + var2[var3] = -103; + } else if (var4 == 353) { + var2[var3] = -102; + } else if (var4 == 8250) { + var2[var3] = -101; + } else if (var4 == 339) { + var2[var3] = -100; + } else if (var4 == 382) { + var2[var3] = -98; + } else if (var4 == 376) { + var2[var3] = -97; + } else { + var2[var3] = 63; + } + } - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(IIII)I", - garbageValue = "-377116898" - ) - static final int method3640(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 = class266.method5066(var3, var5); - int var8 = class266.method5066(var3 + 1, var5); - int var9 = class266.method5066(var3, var5 + 1); - int var10 = class266.method5066(var3 + 1, var5 + 1); - int var12 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; - int var11 = ((65536 - var12) * var7 >> 16) + (var12 * var8 >> 16); - int var13 = class286.method5346(var9, var10, var4, var2); - return class286.method5346(var11, var13, var6, var2); - } - - @ObfuscatedName("hu") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1126084733" - ) - static void method3641() { - Client.menuOptionsCount = 0; - Client.isMenuOpen = false; + return var2; } } diff --git a/runescape-client/src/main/java/RunException.java b/runescape-client/src/main/java/RunException.java index f0e6a6264e..f558191de1 100644 --- a/runescape-client/src/main/java/RunException.java +++ b/runescape-client/src/main/java/RunException.java @@ -4,31 +4,31 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("mr") +@ObfuscatedName("mg") @Implements("RunException") public class RunException extends RuntimeException { - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("RunException_applet") public static Applet RunException_applet; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("localPlayerName") public static String localPlayerName; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -177601011 + intValue = 1500109333 ) @Export("RunException_revision") public static int RunException_revision; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -768179773 + intValue = -706960701 ) @Export("clientType") public static int clientType; - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("message") String message; - @ObfuscatedName("p") + @ObfuscatedName("b") @Export("throwable") Throwable throwable; diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java index b66caf1c32..f6bbf3a9d0 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("el") +@ObfuscatedName("ej") @Implements("Scene") public class Scene { - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("Scene_isLowDetail") public static boolean Scene_isLowDetail; - @ObfuscatedName("n") + @ObfuscatedName("s") @Export("tileUpdateCount") static int tileUpdateCount; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("Scene_plane") static int Scene_plane; - @ObfuscatedName("c") + @ObfuscatedName("t") @Export("Scene_drawnCount") static int Scene_drawnCount; - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("Scene_cameraXTileMin") static int Scene_cameraXTileMin; - @ObfuscatedName("d") + @ObfuscatedName("n") @Export("Scene_cameraXTileMax") static int Scene_cameraXTileMax; - @ObfuscatedName("s") + @ObfuscatedName("u") @Export("Scene_cameraYTileMin") static int Scene_cameraYTileMin; - @ObfuscatedName("t") + @ObfuscatedName("z") @Export("Scene_cameraYTileMax") static int Scene_cameraYTileMax; - @ObfuscatedName("m") + @ObfuscatedName("h") @Export("Scene_cameraXTile") static int Scene_cameraXTile; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("Scene_cameraYTile") static int Scene_cameraYTile; - @ObfuscatedName("q") + @ObfuscatedName("g") @Export("Scene_cameraX") static int Scene_cameraX; - @ObfuscatedName("l") + @ObfuscatedName("r") @Export("Scene_cameraY") static int Scene_cameraY; - @ObfuscatedName("j") + @ObfuscatedName("q") @Export("Scene_cameraZ") static int Scene_cameraZ; - @ObfuscatedName("af") + @ObfuscatedName("aa") @Export("Scene_cameraPitchSine") static int Scene_cameraPitchSine; - @ObfuscatedName("ad") + @ObfuscatedName("av") @Export("Scene_cameraPitchCosine") static int Scene_cameraPitchCosine; - @ObfuscatedName("am") + @ObfuscatedName("aw") @Export("Scene_cameraYawSine") static int Scene_cameraYawSine; - @ObfuscatedName("ai") + @ObfuscatedName("as") @Export("Scene_cameraYawCosine") static int Scene_cameraYawCosine; - @ObfuscatedName("ag") + @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "[Leh;" + signature = "[Lel;" ) @Export("gameObjects") static GameObject[] gameObjects; - @ObfuscatedName("ao") + @ObfuscatedName("au") @Export("checkClick") static boolean checkClick; - @ObfuscatedName("aw") + @ObfuscatedName("ah") @Export("Scene_selectedPlane") static int Scene_selectedPlane; - @ObfuscatedName("ak") + @ObfuscatedName("aq") @Export("Scene_selectedScreenX") static int Scene_selectedScreenX; - @ObfuscatedName("aa") + @ObfuscatedName("ao") @Export("Scene_selectedScreenY") static int Scene_selectedScreenY; - @ObfuscatedName("ab") + @ObfuscatedName("an") @Export("Scene_selectedX") public static int Scene_selectedX; @ObfuscatedName("ar") @Export("Scene_selectedY") public static int Scene_selectedY; - @ObfuscatedName("av") + @ObfuscatedName("az") @Export("viewportWalking") static boolean viewportWalking; - @ObfuscatedName("az") + @ObfuscatedName("ac") @Export("Scene_planesCount") static int Scene_planesCount; - @ObfuscatedName("at") + @ObfuscatedName("al") @Export("Scene_planeOccluderCounts") static int[] Scene_planeOccluderCounts; @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "[[Lej;" + signature = "[[Len;" ) @Export("Scene_planeOccluders") static Occluder[][] Scene_planeOccluders; - @ObfuscatedName("aj") + @ObfuscatedName("ad") @Export("Scene_currentOccludersCount") static int Scene_currentOccludersCount; - @ObfuscatedName("ap") + @ObfuscatedName("aj") @ObfuscatedSignature( - signature = "[Lej;" + signature = "[Len;" ) @Export("Scene_currentOccluders") static Occluder[] Scene_currentOccluders; - @ObfuscatedName("an") + @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "Ljd;" + signature = "Ljs;" ) @Export("Scene_tilesDeque") static NodeDeque Scene_tilesDeque; - @ObfuscatedName("al") - static final int[] field1814; - @ObfuscatedName("ay") - static final int[] field1838; - @ObfuscatedName("ax") - static final int[] field1839; - @ObfuscatedName("au") - static final int[] field1798; - @ObfuscatedName("as") + @ObfuscatedName("at") + static final int[] field1823; + @ObfuscatedName("af") + static final int[] field1778; + @ObfuscatedName("ap") + static final int[] field1805; + @ObfuscatedName("ai") static final int[] field1841; - @ObfuscatedName("ah") - static final int[] field1848; - @ObfuscatedName("bi") - static final int[] field1843; - @ObfuscatedName("bm") + @ObfuscatedName("am") + static final int[] field1827; + @ObfuscatedName("ab") + static final int[] field1828; + @ObfuscatedName("bj") + static final int[] field1789; + @ObfuscatedName("bc") @Export("visibilityMap") static boolean[][][][] visibilityMap; - @ObfuscatedName("bq") + @ObfuscatedName("by") @Export("visibleTiles") static boolean[][] visibleTiles; - @ObfuscatedName("bf") + @ObfuscatedName("bz") @Export("Scene_viewportXCenter") static int Scene_viewportXCenter; - @ObfuscatedName("by") + @ObfuscatedName("bm") @Export("Scene_viewportYCenter") static int Scene_viewportYCenter; - @ObfuscatedName("br") + @ObfuscatedName("bo") @Export("Scene_viewportXMin") static int Scene_viewportXMin; - @ObfuscatedName("ba") + @ObfuscatedName("bs") @Export("Scene_viewportYMin") static int Scene_viewportYMin; - @ObfuscatedName("bb") + @ObfuscatedName("ba") @Export("Scene_viewportXMax") static int Scene_viewportXMax; - @ObfuscatedName("bg") + @ObfuscatedName("bn") @Export("Scene_viewportYMax") static int Scene_viewportYMax; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("planes") int planes; - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("xSize") int xSize; - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("ySize") int ySize; - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("tileHeights") int[][][] tileHeights; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "[[[Ldm;" + signature = "[[[Ldy;" ) @Export("tiles") Tile[][][] tiles; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("minPlane") int minPlane; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("tempGameObjectsCount") int tempGameObjectsCount; - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "[Leh;" + signature = "[Lel;" ) @Export("tempGameObjects") GameObject[] tempGameObjects; - @ObfuscatedName("i") - int[][][] field1800; - @ObfuscatedName("bn") + @ObfuscatedName("d") + int[][][] field1786; + @ObfuscatedName("bq") @Export("tileShape2D") int[][] tileShape2D; - @ObfuscatedName("bj") + @ObfuscatedName("bx") @Export("tileRotation2D") int[][] tileRotation2D; @@ -206,13 +206,13 @@ public class Scene { Scene_currentOccludersCount = 0; Scene_currentOccluders = new Occluder[500]; Scene_tilesDeque = new NodeDeque(); - field1814 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; - field1838 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; - field1839 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; - field1798 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; - field1841 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; - field1848 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; - field1843 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; + field1823 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; + field1778 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; + field1805 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; + field1841 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; + field1827 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; + field1828 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; + field1789 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; 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.field1800 = new int[var1][var2 + 1][var3 + 1]; + this.field1786 = new int[var1][var2 + 1][var3 + 1]; this.tileHeights = var4; this.clear(); } - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("clear") public void clear() { int var1; @@ -264,7 +264,7 @@ public class Scene { } - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("init") public void init(int var1) { this.minPlane = var1; @@ -279,7 +279,7 @@ public class Scene { } - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("setLinkBelow") public void setLinkBelow(int var1, int var2) { Tile var3 = this.tiles[0][var1][var2]; @@ -292,8 +292,7 @@ public class Scene { for (int var6 = 0; var6 < var5.gameObjectsCount; ++var6) { GameObject var7 = var5.gameObjects[var6]; long var9 = var7.tag; - int var11 = (int)(var9 >>> 14 & 3L); - boolean var8 = var11 == 2; + boolean var8 = class268.method5012(var9) == 2; if (var8 && var7.startX == var1 && var2 == var7.startY) { --var7.plane; } @@ -309,7 +308,7 @@ public class Scene { this.tiles[3][var1][var2] = null; } - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("setTileMinPlane") public void setTileMinPlane(int var1, int var2, int var3, int var4) { Tile var5 = this.tiles[var1][var2][var3]; @@ -318,7 +317,7 @@ public class Scene { } } - @ObfuscatedName("p") + @ObfuscatedName("b") @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 +355,9 @@ public class Scene { } } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(IIIILee;JI)V" + signature = "(IIIILep;JI)V" ) @Export("newFloorDecoration") public void newFloorDecoration(int var1, int var2, int var3, int var4, Entity var5, long var6, int var8) { @@ -366,7 +365,7 @@ public class Scene { FloorDecoration var9 = new FloorDecoration(); var9.entity = var5; var9.x = var2 * 128 + 64; - var9.y = var3 * 134217728 + 67108864; + var9.y = var3 * 128 + 64; var9.tileHeight = var4; var9.tag = var6; var9.flags = var8; @@ -378,15 +377,15 @@ public class Scene { } } - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IIIILee;JLee;Lee;)V" + signature = "(IIIILep;JLep;Lep;)V" ) @Export("newGroundItemPile") public void newGroundItemPile(int var1, int var2, int var3, int var4, Entity var5, long var6, Entity var8, Entity var9) { TileItemPile var10 = new TileItemPile(); var10.first = var5; - var10.x = var2 * 128 + 64; + var10.x = var2 * 134217728 + 67108864; var10.y = var3 * 128 + 64; var10.tileHeight = var4; var10.tag = var6; @@ -414,9 +413,9 @@ public class Scene { this.tiles[var1][var2][var3].tileItemPile = var10; } - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(IIIILee;Lee;IIJI)V" + signature = "(IIIILep;Lep;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) { @@ -442,9 +441,9 @@ public class Scene { } } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(IIIILee;Lee;IIIIJI)V" + signature = "(IIIILep;Lep;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) { @@ -472,11 +471,11 @@ public class Scene { } } - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IIIIIILee;IJI)Z" + signature = "(IIIIIILep;IJI)Z" ) - public boolean method3242(int var1, int var2, int var3, int var4, int var5, int var6, Entity var7, int var8, long var9, int var11) { + public boolean method3141(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 { @@ -486,9 +485,9 @@ public class Scene { } } - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IIIIILee;IJZ)Z" + signature = "(IIIIILep;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) { @@ -525,18 +524,18 @@ public class Scene { } } - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(IIIIILee;IJIIII)Z" + signature = "(IIIIILep;IJIIII)Z" ) @Export("addNullableObject") public boolean addNullableObject(int var1, int var2, int var3, int var4, int var5, Entity var6, int var7, long var8, int var10, int var11, int var12, int var13) { return var6 == null ? true : this.newGameObject(var1, var10, var11, var12 - var10 + 1, var13 - var11 + 1, var2, var3, var4, var6, var7, true, var8, 0); } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IIIIIIIILee;IZJI)Z" + signature = "(IIIIIIIILep;IZJI)Z" ) @Export("newGameObject") boolean newGameObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, Entity var9, int var10, boolean var11, long var12, int var14) { @@ -547,8 +546,8 @@ public class Scene { return false; } - Tile var17 = this.tiles[var1][var15][var16]; - if (var17 != null && var17.gameObjectsCount >= 5) { + Tile var23 = this.tiles[var1][var15][var16]; + if (var23 != null && var23.gameObjectsCount >= 5) { return false; } } @@ -569,7 +568,7 @@ public class Scene { var21.endY = var3 + var5 - 1; for (var16 = var2; var16 < var2 + var4; ++var16) { - for (int var22 = var3; var22 < var3 + var5; ++var22) { + for (int var17 = var3; var17 < var3 + var5; ++var17) { int var18 = 0; if (var16 > var2) { ++var18; @@ -579,25 +578,25 @@ public class Scene { var18 += 4; } - if (var22 > var3) { + if (var17 > var3) { var18 += 8; } - if (var22 < var3 + var5 - 1) { + if (var17 < var3 + var5 - 1) { var18 += 2; } for (int var19 = var1; var19 >= 0; --var19) { - if (this.tiles[var19][var16][var22] == null) { - this.tiles[var19][var16][var22] = new Tile(var19, var16, var22); + if (this.tiles[var19][var16][var17] == null) { + this.tiles[var19][var16][var17] = new Tile(var19, var16, var17); } } - Tile var23 = this.tiles[var1][var16][var22]; - 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 +607,7 @@ public class Scene { return true; } - @ObfuscatedName("n") + @ObfuscatedName("j") @Export("clearTempGameObjects") public void clearTempGameObjects() { for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { @@ -620,9 +619,9 @@ public class Scene { this.tempGameObjectsCount = 0; } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Leh;)V" + signature = "(Lel;)V" ) @Export("removeGameObject") void removeGameObject(GameObject var1) { @@ -656,8 +655,8 @@ public class Scene { } - @ObfuscatedName("s") - public void method3124(int var1, int var2, int var3, int var4) { + @ObfuscatedName("u") + public void method3109(int var1, int var2, int var3, int var4) { Tile var5 = this.tiles[var1][var2][var3]; if (var5 != null) { WallDecoration var6 = var5.wallDecoration; @@ -668,7 +667,7 @@ public class Scene { } } - @ObfuscatedName("t") + @ObfuscatedName("z") @Export("removeBoundaryObject") public void removeBoundaryObject(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -677,7 +676,7 @@ public class Scene { } } - @ObfuscatedName("m") + @ObfuscatedName("h") @Export("removeWallDecoration") public void removeWallDecoration(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -686,7 +685,7 @@ public class Scene { } } - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("removeGameObject") public void removeGameObject(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -694,8 +693,7 @@ public class Scene { for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { GameObject var6 = var4.gameObjects[var5]; long var8 = var6.tag; - int var10 = (int)(var8 >>> 14 & 3L); - boolean var7 = var10 == 2; + boolean var7 = class268.method5012(var8) == 2; if (var7 && var2 == var6.startX && var3 == var6.startY) { this.removeGameObject(var6); return; @@ -705,7 +703,7 @@ public class Scene { } } - @ObfuscatedName("q") + @ObfuscatedName("aa") @Export("removeFloorDecoration") public void removeFloorDecoration(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -714,7 +712,7 @@ public class Scene { } } - @ObfuscatedName("l") + @ObfuscatedName("av") @Export("removeGroundItemPile") public void removeGroundItemPile(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -723,36 +721,38 @@ public class Scene { } } - @ObfuscatedName("j") + @ObfuscatedName("aw") @ObfuscatedSignature( - signature = "(III)Leu;" + signature = "(III)Ler;" ) - public BoundaryObject method3130(int var1, int var2, int var3) { + public BoundaryObject method3112(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 == null ? null : var4.boundaryObject; } - @ObfuscatedName("ad") + @ObfuscatedName("as") @ObfuscatedSignature( - signature = "(III)Let;" + signature = "(III)Lee;" ) - public WallDecoration method3131(int var1, int var2, int var3) { + public WallDecoration method3113(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 == null ? null : var4.wallDecoration; } - @ObfuscatedName("am") + @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "(III)Leh;" + signature = "(III)Lel;" ) - public GameObject method3253(int var1, int var2, int var3) { + public GameObject method3114(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; if (var4 == null) { return null; } else { for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { GameObject var6 = var4.gameObjects[var5]; - if (class247.method4577(var6.tag) && var2 == var6.startX && var3 == var6.startY) { + long var8 = var6.tag; + boolean var7 = class268.method5012(var8) == 2; + if (var7 && var2 == var6.startX && var3 == var6.startY) { return var6; } } @@ -761,7 +761,7 @@ public class Scene { } } - @ObfuscatedName("ai") + @ObfuscatedName("au") @ObfuscatedSignature( signature = "(III)Ldu;" ) @@ -771,21 +771,21 @@ public class Scene { return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; } - @ObfuscatedName("ag") + @ObfuscatedName("ah") @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("ao") + @ObfuscatedName("aq") @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("aw") + @ObfuscatedName("ao") @Export("getGameObjectTag") public long getGameObjectTag(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -795,8 +795,7 @@ public class Scene { for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { GameObject var6 = var4.gameObjects[var5]; long var8 = var6.tag; - int var10 = (int)(var8 >>> 14 & 3L); - boolean var7 = var10 == 2; + boolean var7 = class268.method5012(var8) == 2; if (var7 && var2 == var6.startX && var3 == var6.startY) { return var6.tag; } @@ -806,14 +805,14 @@ public class Scene { } } - @ObfuscatedName("ak") + @ObfuscatedName("an") @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("aa") + @ObfuscatedName("ar") @Export("getObjectFlags") public int getObjectFlags(int var1, int var2, int var3, long var4) { Tile var6 = this.tiles[var1][var2][var3]; @@ -836,8 +835,8 @@ public class Scene { } } - @ObfuscatedName("ab") - public void method3165(int var1, int var2, int var3) { + @ObfuscatedName("az") + public void method3191(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) { @@ -847,11 +846,11 @@ public class Scene { ModelData var10; if (var8 != null && var8.entity1 instanceof ModelData) { ModelData var9 = (ModelData)var8.entity1; - this.method3141(var9, var4, var5, var6, 1, 1); + this.method3123(var9, var4, var5, var6, 1, 1); if (var8.entity2 instanceof ModelData) { var10 = (ModelData)var8.entity2; - this.method3141(var10, var4, var5, var6, 1, 1); - ModelData.method2828(var9, var10, 0, 0, 0, false); + this.method3123(var10, var4, var5, var6, 1, 1); + ModelData.method2818(var9, var10, 0, 0, 0, false); var8.entity2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); } @@ -862,7 +861,7 @@ public class Scene { GameObject var14 = var7.gameObjects[var12]; if (var14 != null && var14.entity instanceof ModelData) { ModelData var11 = (ModelData)var14.entity; - this.method3141(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); + this.method3123(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); } } @@ -870,7 +869,7 @@ public class Scene { FloorDecoration var13 = var7.floorDecoration; if (var13 != null && var13.entity instanceof ModelData) { var10 = (ModelData)var13.entity; - this.method3140(var10, var4, var5, var6); + this.method3205(var10, var4, var5, var6); var13.entity = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); } } @@ -880,18 +879,18 @@ public class Scene { } - @ObfuscatedName("ar") + @ObfuscatedName("ay") @ObfuscatedSignature( - signature = "(Ldq;III)V" + signature = "(Ldd;III)V" ) - void method3140(ModelData var1, int var2, int var3, int var4) { + void method3205(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.method2828(var1, var6, 128, 0, 0, true); + ModelData.method2818(var1, var6, 128, 0, 0, true); } } @@ -899,7 +898,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.method2828(var1, var6, 0, 0, 128, true); + ModelData.method2818(var1, var6, 0, 0, 128, true); } } @@ -907,7 +906,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.method2828(var1, var6, 128, 0, 128, true); + ModelData.method2818(var1, var6, 128, 0, 128, true); } } @@ -915,17 +914,17 @@ public class Scene { var5 = this.tiles[var2][var3 + 1][var4 - 1]; if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) { var6 = (ModelData)var5.floorDecoration.entity; - ModelData.method2828(var1, var6, 128, 0, -128, true); + ModelData.method2818(var1, var6, 128, 0, -128, true); } } } - @ObfuscatedName("av") + @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "(Ldq;IIIII)V" + signature = "(Ldd;IIIII)V" ) - void method3141(ModelData var1, int var2, int var3, int var4, int var5, int var6) { + void method3123(ModelData var1, int var2, int var3, int var4, int var5, int var6) { boolean var7 = true; int var8 = var3; int var9 = var3 + var5; @@ -946,12 +945,12 @@ public class Scene { ModelData var18; if (var17.entity1 instanceof ModelData) { var18 = (ModelData)var17.entity1; - ModelData.method2828(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); + ModelData.method2818(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.method2828(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); + ModelData.method2818(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); } } @@ -961,7 +960,7 @@ public class Scene { ModelData var20 = (ModelData)var19.entity; int var21 = var19.endX - var19.startX + 1; int var22 = var19.endY - var19.startY + 1; - ModelData.method2828(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); + ModelData.method2818(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); } } } @@ -977,7 +976,7 @@ public class Scene { } - @ObfuscatedName("aq") + @ObfuscatedName("ac") @Export("drawTileMinimap") public void drawTileMinimap(int[] var1, int var2, int var3, int var4, int var5, int var6) { Tile var7 = this.tiles[var4][var5][var6]; @@ -1042,10 +1041,10 @@ public class Scene { } } - @ObfuscatedName("at") + @ObfuscatedName("ad") @Export("menuOpen") public void menuOpen(int var1, int var2, int var3, boolean var4) { - if (!method3146() || var4) { + if (!method3092() || var4) { checkClick = true; viewportWalking = var4; Scene_selectedPlane = var1; @@ -1056,13 +1055,13 @@ public class Scene { } } - @ObfuscatedName("ae") + @ObfuscatedName("aj") @Export("setViewportWalking") public void setViewportWalking() { viewportWalking = true; } - @ObfuscatedName("an") + @ObfuscatedName("af") @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5, int var6) { if (var1 < 0) { @@ -1129,7 +1128,11 @@ public class Scene { for (var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) { Tile var11 = var8[var9][var10]; if (var11 != null) { - if (var11.minPlane <= var6 && (visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] || this.tileHeights[var7][var9][var10] - var2 >= 2000)) { + if (var11.minPlane > var6 || !visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] && this.tileHeights[var7][var9][var10] - var2 < 2000) { + var11.drawPrimary = false; + var11.drawSecondary = false; + var11.drawGameObjectEdges = 0; + } else { var11.drawPrimary = true; var11.drawSecondary = true; if (var11.gameObjectsCount > 0) { @@ -1139,10 +1142,6 @@ public class Scene { } ++tileUpdateCount; - } else { - var11.drawPrimary = false; - var11.drawSecondary = false; - var11.drawGameObjectEdges = 0; } } } @@ -1259,9 +1258,9 @@ public class Scene { checkClick = false; } - @ObfuscatedName("al") + @ObfuscatedName("ap") @ObfuscatedSignature( - signature = "(Ldm;Z)V" + signature = "(Ldy;Z)V" ) @Export("drawTile") void drawTile(Tile var1, boolean var2) { @@ -1355,10 +1354,10 @@ public class Scene { if (var3.linkedBelowTile != null) { var9 = var3.linkedBelowTile; if (var9.paint != null) { - if (!this.method3216(0, var4, var5)) { + if (!this.method3138(0, var4, var5)) { this.drawTileUnderlay(var9.paint, 0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } - } else if (var9.model != null && !this.method3216(0, var4, var5)) { + } else if (var9.model != null && !this.method3138(0, var4, var5)) { this.drawTileOverlay(var9.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } @@ -1377,13 +1376,13 @@ public class Scene { var20 = false; if (var3.paint != null) { - if (!this.method3216(var7, var4, var5)) { + if (!this.method3138(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.method3216(var7, var4, var5)) { + } else if (var3.model != null && !this.method3138(var7, var4, var5)) { var20 = true; this.drawTileOverlay(var3.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } @@ -1405,43 +1404,43 @@ public class Scene { var21 += 6; } - var11 = field1814[var21]; - var3.field1650 = field1839[var21]; + var11 = field1823[var21]; + var3.field1641 = field1805[var21]; } if (var31 != null) { - if ((var31.orientationA & field1838[var21]) != 0) { + if ((var31.orientationA & field1778[var21]) != 0) { if (var31.orientationA == 16) { var3.drawGameObjectEdges = 3; - var3.field1655 = field1798[var21]; - var3.field1656 = 3 - var3.field1655; + var3.field1630 = field1841[var21]; + var3.field1640 = 3 - var3.field1630; } else if (var31.orientationA == 32) { var3.drawGameObjectEdges = 6; - var3.field1655 = field1841[var21]; - var3.field1656 = 6 - var3.field1655; + var3.field1630 = field1827[var21]; + var3.field1640 = 6 - var3.field1630; } else if (var31.orientationA == 64) { var3.drawGameObjectEdges = 12; - var3.field1655 = field1848[var21]; - var3.field1656 = 12 - var3.field1655; + var3.field1630 = field1828[var21]; + var3.field1640 = 12 - var3.field1630; } else { var3.drawGameObjectEdges = 9; - var3.field1655 = field1843[var21]; - var3.field1656 = 9 - var3.field1655; + var3.field1630 = field1789[var21]; + var3.field1640 = 9 - var3.field1630; } } else { var3.drawGameObjectEdges = 0; } - if ((var31.orientationA & var11) != 0 && !this.method3224(var7, var4, var5, var31.orientationA)) { + if ((var31.orientationA & var11) != 0 && !this.method3139(var7, var4, var5, var31.orientationA)) { var31.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x * 4096 - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y * 4096 - Scene_cameraZ, var31.tag); } - if ((var31.orientationB & var11) != 0 && !this.method3224(var7, var4, var5, var31.orientationB)) { + if ((var31.orientationB & var11) != 0 && !this.method3139(var7, var4, var5, var31.orientationB)) { var31.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x * 4096 - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y * 4096 - Scene_cameraZ, var31.tag); } } - if (var13 != null && !this.method3157(var7, var4, var5, var13.entity1.height)) { + if (var13 != null && !this.method3170(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) { @@ -1473,21 +1472,21 @@ public class Scene { 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 * 64 - Scene_cameraZ, var22.tag); + 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); + var23.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x * 64 - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y * 4096 - Scene_cameraZ, var23.tag); } 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); + var23.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x * 64 - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y * 4096 - Scene_cameraZ, var23.tag); } 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); + var23.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x * 64 - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y * 4096 - Scene_cameraZ, var23.tag); } } } @@ -1529,7 +1528,7 @@ public class Scene { var20 = true; for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) { - if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field1655) { + if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field1630) { var20 = false; break; } @@ -1537,7 +1536,7 @@ public class Scene { if (var20) { var10 = var3.boundaryObject; - if (!this.method3224(var7, var4, var5, var10.orientationA)) { + if (!this.method3139(var7, var4, var5, var10.orientationA)) { var10.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x * 4096 - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y * 4096 - Scene_cameraZ, var10.tag); } @@ -1584,7 +1583,7 @@ public class Scene { var16 += 2; } - if ((var16 & var36.drawGameObjectEdges) == var3.field1656) { + if ((var16 & var36.drawGameObjectEdges) == var3.field1640) { var3.drawGameObjects = true; continue label563; } @@ -1602,9 +1601,9 @@ public class Scene { var15 = Scene_cameraYTile - var12.startY; var16 = var12.endY - Scene_cameraYTile; if (var16 > var15) { - var12.field1925 = var24 + var16; + var12.field1909 = var24 + var16; } else { - var12.field1925 = var24 + var15; + var12.field1909 = var24 + var15; } } } @@ -1616,10 +1615,10 @@ public class Scene { for (var24 = 0; var24 < var21; ++var24) { GameObject var35 = gameObjects[var24]; if (var35.lastDrawn != Scene_drawnCount) { - if (var35.field1925 > var11) { - var11 = var35.field1925; + if (var35.field1909 > var11) { + var11 = var35.field1909; var25 = var24; - } else if (var11 == var35.field1925) { + } else if (var11 == var35.field1909) { var15 = var35.centerX - Scene_cameraX; var16 = var35.centerY - Scene_cameraZ; var17 = gameObjects[var25].centerX - Scene_cameraX; @@ -1637,7 +1636,7 @@ public class Scene { GameObject var33 = gameObjects[var25]; var33.lastDrawn = Scene_drawnCount; - if (!this.method3158(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.entity.height)) { + if (!this.method3200(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); } @@ -1697,22 +1696,22 @@ public class Scene { TileItemPile var32 = var3.tileItemPile; if (var32 != null && var32.height != 0) { if (var32.second != null) { - var32.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x * 4096 - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y * 4096 - Scene_cameraZ, var32.tag); + var32.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x * 64 - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y * 4096 - Scene_cameraZ, var32.tag); } if (var32.third != null) { - var32.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x * 4096 - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y * 4096 - Scene_cameraZ, var32.tag); + var32.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x * 64 - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y * 4096 - Scene_cameraZ, var32.tag); } if (var32.first != null) { - var32.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x * 4096 - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y * 4096 - Scene_cameraZ, var32.tag); + var32.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x * 64 - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y * 4096 - Scene_cameraZ, var32.tag); } } - if (var3.field1650 != 0) { + if (var3.field1641 != 0) { WallDecoration var29 = var3.wallDecoration; - if (var29 != null && !this.method3157(var7, var4, var5, var29.entity1.height)) { - if ((var29.orientation & var3.field1650) != 0) { + if (var29 != null && !this.method3170(var7, var4, var5, var29.entity1.height)) { + if ((var29.orientation & var3.field1641) != 0) { var29.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.xOffset + (var29.x * 4096 - Scene_cameraX), var29.tileHeight - Scene_cameraY, var29.yOffset + (var29.y * 4096 - Scene_cameraZ), var29.tag); } else if (var29.orientation == 256) { var11 = var29.x * 4096 - Scene_cameraX; @@ -1741,11 +1740,11 @@ public class Scene { BoundaryObject var27 = var3.boundaryObject; if (var27 != null) { - if ((var27.orientationB & var3.field1650) != 0 && !this.method3224(var7, var4, var5, var27.orientationB)) { + if ((var27.orientationB & var3.field1641) != 0 && !this.method3139(var7, var4, var5, var27.orientationB)) { var27.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x * 4096 - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y * 4096 - Scene_cameraZ, var27.tag); } - if ((var27.orientationA & var3.field1650) != 0 && !this.method3224(var7, var4, var5, var27.orientationA)) { + if ((var27.orientationA & var3.field1641) != 0 && !this.method3139(var7, var4, var5, var27.orientationA)) { var27.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x * 4096 - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y * 4096 - Scene_cameraZ, var27.tag); } } @@ -1789,9 +1788,9 @@ public class Scene { } } - @ObfuscatedName("ay") + @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(Ley;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) { @@ -1845,9 +1844,9 @@ public class Scene { Rasterizer3D.Rasterizer3D_alpha = 0; int var30; if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { - Rasterizer3D.field1757 = false; + Rasterizer3D.field1751 = false; if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field1757 = true; + Rasterizer3D.field1751 = true; } if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { @@ -1857,7 +1856,7 @@ public class Scene { if (var1.texture == -1) { if (var1.neColor != 12345678) { - Rasterizer3D.method3030(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); + Rasterizer3D.method3000(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); } } else if (!Scene_isLowDetail) { if (var1.isFlat) { @@ -1867,14 +1866,14 @@ public class Scene { } } else { var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); - Rasterizer3D.method3030(var27, var29, var25, var26, var28, var24, method3152(var30, var1.neColor), method3152(var30, var1.nwColor), method3152(var30, var1.seColor)); + Rasterizer3D.method3000(var27, var29, var25, var26, var28, var24, method3135(var30, var1.neColor), method3135(var30, var1.nwColor), method3135(var30, var1.seColor)); } } if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { - Rasterizer3D.field1757 = false; + Rasterizer3D.field1751 = false; if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field1757 = true; + Rasterizer3D.field1751 = true; } if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { @@ -1884,13 +1883,13 @@ public class Scene { if (var1.texture == -1) { if (var1.swColor != 12345678) { - Rasterizer3D.method3030(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor); + Rasterizer3D.method3000(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.method3030(var23, var25, var29, var22, var24, var28, method3152(var30, var1.swColor), method3152(var30, var1.seColor), method3152(var30, var1.nwColor)); + Rasterizer3D.method3000(var23, var25, var29, var22, var24, var28, method3135(var30, var1.swColor), method3135(var30, var1.seColor), method3135(var30, var1.nwColor)); } } @@ -1900,9 +1899,9 @@ public class Scene { } } - @ObfuscatedName("ax") + @ObfuscatedName("am") @ObfuscatedSignature( - signature = "(Ldo;IIIIII)V" + signature = "(Ldv;IIIIII)V" ) @Export("drawTileOverlay") void drawTileOverlay(TileModel var1, int var2, int var3, int var4, int var5, int var6, int var7) { @@ -1927,13 +1926,13 @@ public class Scene { } if (var1.triangleTextureId != null) { - TileModel.field1596[var9] = var10; - TileModel.field1599[var9] = var13; - TileModel.field1598[var9] = var12; + TileModel.field1580[var9] = var10; + TileModel.field1564[var9] = var13; + TileModel.field1582[var9] = var12; } - TileModel.field1594[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; - TileModel.field1595[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; + TileModel.field1578[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; + TileModel.field1579[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; } Rasterizer3D.Rasterizer3D_alpha = 0; @@ -1943,16 +1942,16 @@ public class Scene { var10 = var1.faceX[var9]; var11 = var1.faceY[var9]; var12 = var1.faceZ[var9]; - var13 = TileModel.field1594[var10]; - int var14 = TileModel.field1594[var11]; - int var15 = TileModel.field1594[var12]; - int var16 = TileModel.field1595[var10]; - int var17 = TileModel.field1595[var11]; - int var18 = TileModel.field1595[var12]; + var13 = TileModel.field1578[var10]; + int var14 = TileModel.field1578[var11]; + int var15 = TileModel.field1578[var12]; + int var16 = TileModel.field1579[var10]; + int var17 = TileModel.field1579[var11]; + int var18 = TileModel.field1579[var12]; if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { - Rasterizer3D.field1757 = false; + Rasterizer3D.field1751 = false; if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field1757 = true; + Rasterizer3D.field1751 = true; } if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { @@ -1963,23 +1962,23 @@ public class Scene { if (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) { if (!Scene_isLowDetail) { if (var1.isFlat) { - Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field1596[0], TileModel.field1596[1], TileModel.field1596[3], TileModel.field1599[0], TileModel.field1599[1], TileModel.field1599[3], TileModel.field1598[0], TileModel.field1598[1], TileModel.field1598[3], var1.triangleTextureId[var9]); + Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field1580[0], TileModel.field1580[1], TileModel.field1580[3], TileModel.field1564[0], TileModel.field1564[1], TileModel.field1564[3], TileModel.field1582[0], TileModel.field1582[1], TileModel.field1582[3], var1.triangleTextureId[var9]); } else { - Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field1596[var10], TileModel.field1596[var11], TileModel.field1596[var12], TileModel.field1599[var10], TileModel.field1599[var11], TileModel.field1599[var12], TileModel.field1598[var10], TileModel.field1598[var11], TileModel.field1598[var12], var1.triangleTextureId[var9]); + Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field1580[var10], TileModel.field1580[var11], TileModel.field1580[var12], TileModel.field1564[var10], TileModel.field1564[var11], TileModel.field1564[var12], TileModel.field1582[var10], TileModel.field1582[var11], TileModel.field1582[var12], var1.triangleTextureId[var9]); } } else { int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); - Rasterizer3D.method3030(var16, var17, var18, var13, var14, var15, method3152(var19, var1.triangleColorA[var9]), method3152(var19, var1.triangleColorB[var9]), method3152(var19, var1.triangleColorC[var9])); + Rasterizer3D.method3000(var16, var17, var18, var13, var14, var15, method3135(var19, var1.triangleColorA[var9]), method3135(var19, var1.triangleColorB[var9]), method3135(var19, var1.triangleColorC[var9])); } } else if (var1.triangleColorA[var9] != 12345678) { - Rasterizer3D.method3030(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); + Rasterizer3D.method3000(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); } } } } - @ObfuscatedName("ah") + @ObfuscatedName("bg") @Export("occlude") void occlude() { int var1 = Scene_planeOccluderCounts[Scene_plane]; @@ -2018,20 +2017,20 @@ public class Scene { if (var13) { var9 = Scene_cameraX - var4.minX; if (var9 > 32) { - var4.field1896 = 1; + var4.field1877 = 1; } else { if (var9 >= -32) { continue; } - var4.field1896 = 2; + var4.field1877 = 2; var9 = -var9; } - var4.field1900 = (var4.minZ - Scene_cameraZ << 8) / var9; - var4.field1890 = (var4.maxZ - Scene_cameraZ << 8) / var9; - var4.field1901 = (var4.minY - Scene_cameraY << 8) / var9; - var4.field1902 = (var4.maxY - Scene_cameraY << 8) / var9; + var4.field1880 = (var4.minZ - Scene_cameraZ << 8) / var9; + var4.field1881 = (var4.maxZ - Scene_cameraZ << 8) / var9; + var4.field1875 = (var4.minY - Scene_cameraY << 8) / var9; + var4.field1872 = (var4.maxY - Scene_cameraY << 8) / var9; Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } @@ -2060,20 +2059,20 @@ public class Scene { if (var13) { var9 = Scene_cameraZ - var4.minZ; if (var9 > 32) { - var4.field1896 = 3; + var4.field1877 = 3; } else { if (var9 >= -32) { continue; } - var4.field1896 = 4; + var4.field1877 = 4; var9 = -var9; } - var4.field1897 = (var4.minX - Scene_cameraX << 8) / var9; - var4.field1898 = (var4.maxX - Scene_cameraX << 8) / var9; - var4.field1901 = (var4.minY - Scene_cameraY << 8) / var9; - var4.field1902 = (var4.maxY - Scene_cameraY << 8) / var9; + var4.field1878 = (var4.minX - Scene_cameraX << 8) / var9; + var4.field1879 = (var4.maxX - Scene_cameraX << 8) / var9; + var4.field1875 = (var4.minY - Scene_cameraY << 8) / var9; + var4.field1872 = (var4.maxY - Scene_cameraY << 8) / var9; Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } @@ -2114,11 +2113,11 @@ public class Scene { } if (var10) { - var4.field1896 = 5; - var4.field1897 = (var4.minX - Scene_cameraX << 8) / var5; - var4.field1898 = (var4.maxX - Scene_cameraX << 8) / var5; - var4.field1900 = (var4.minZ - Scene_cameraZ << 8) / var5; - var4.field1890 = (var4.maxZ - Scene_cameraZ << 8) / var5; + var4.field1877 = 5; + var4.field1878 = (var4.minX - Scene_cameraX << 8) / var5; + var4.field1879 = (var4.maxX - Scene_cameraX << 8) / var5; + var4.field1880 = (var4.minZ - Scene_cameraZ << 8) / var5; + var4.field1881 = (var4.maxZ - Scene_cameraZ << 8) / var5; Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } @@ -2128,9 +2127,9 @@ public class Scene { } - @ObfuscatedName("bi") - boolean method3216(int var1, int var2, int var3) { - int var4 = this.field1800[var1][var2][var3]; + @ObfuscatedName("bw") + boolean method3138(int var1, int var2, int var3) { + int var4 = this.field1786[var1][var2][var3]; if (var4 == -Scene_drawnCount) { return false; } else if (var4 == Scene_drawnCount) { @@ -2138,19 +2137,19 @@ public class Scene { } else { int var5 = var2 << 7; int var6 = var3 << 7; - if (this.method3159(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method3159(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method3159(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method3159(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { - this.field1800[var1][var2][var3] = Scene_drawnCount; + if (this.method3142(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method3142(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method3142(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method3142(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { + this.field1786[var1][var2][var3] = Scene_drawnCount; return true; } else { - this.field1800[var1][var2][var3] = -Scene_drawnCount; + this.field1786[var1][var2][var3] = -Scene_drawnCount; return false; } } } - @ObfuscatedName("bo") - boolean method3224(int var1, int var2, int var3, int var4) { - if (!this.method3216(var1, var2, var3)) { + @ObfuscatedName("bk") + boolean method3139(int var1, int var2, int var3, int var4) { + if (!this.method3138(var1, var2, var3)) { return false; } else { int var5 = var2 << 7; @@ -2162,30 +2161,30 @@ public class Scene { if (var4 < 16) { if (var4 == 1) { if (var5 > Scene_cameraX) { - if (!this.method3159(var5, var7, var6)) { + if (!this.method3142(var5, var7, var6)) { return false; } - if (!this.method3159(var5, var7, var6 + 128)) { + if (!this.method3142(var5, var7, var6 + 128)) { return false; } } if (var1 > 0) { - if (!this.method3159(var5, var8, var6)) { + if (!this.method3142(var5, var8, var6)) { return false; } - if (!this.method3159(var5, var8, var6 + 128)) { + if (!this.method3142(var5, var8, var6 + 128)) { return false; } } - if (!this.method3159(var5, var9, var6)) { + if (!this.method3142(var5, var9, var6)) { return false; } - if (!this.method3159(var5, var9, var6 + 128)) { + if (!this.method3142(var5, var9, var6 + 128)) { return false; } @@ -2194,30 +2193,30 @@ public class Scene { if (var4 == 2) { if (var6 < Scene_cameraZ) { - if (!this.method3159(var5, var7, var6 + 128)) { + if (!this.method3142(var5, var7, var6 + 128)) { return false; } - if (!this.method3159(var5 + 128, var7, var6 + 128)) { + if (!this.method3142(var5 + 128, var7, var6 + 128)) { return false; } } if (var1 > 0) { - if (!this.method3159(var5, var8, var6 + 128)) { + if (!this.method3142(var5, var8, var6 + 128)) { return false; } - if (!this.method3159(var5 + 128, var8, var6 + 128)) { + if (!this.method3142(var5 + 128, var8, var6 + 128)) { return false; } } - if (!this.method3159(var5, var9, var6 + 128)) { + if (!this.method3142(var5, var9, var6 + 128)) { return false; } - if (!this.method3159(var5 + 128, var9, var6 + 128)) { + if (!this.method3142(var5 + 128, var9, var6 + 128)) { return false; } @@ -2226,30 +2225,30 @@ public class Scene { if (var4 == 4) { if (var5 < Scene_cameraX) { - if (!this.method3159(var5 + 128, var7, var6)) { + if (!this.method3142(var5 + 128, var7, var6)) { return false; } - if (!this.method3159(var5 + 128, var7, var6 + 128)) { + if (!this.method3142(var5 + 128, var7, var6 + 128)) { return false; } } if (var1 > 0) { - if (!this.method3159(var5 + 128, var8, var6)) { + if (!this.method3142(var5 + 128, var8, var6)) { return false; } - if (!this.method3159(var5 + 128, var8, var6 + 128)) { + if (!this.method3142(var5 + 128, var8, var6 + 128)) { return false; } } - if (!this.method3159(var5 + 128, var9, var6)) { + if (!this.method3142(var5 + 128, var9, var6)) { return false; } - if (!this.method3159(var5 + 128, var9, var6 + 128)) { + if (!this.method3142(var5 + 128, var9, var6 + 128)) { return false; } @@ -2258,30 +2257,30 @@ public class Scene { if (var4 == 8) { if (var6 > Scene_cameraZ) { - if (!this.method3159(var5, var7, var6)) { + if (!this.method3142(var5, var7, var6)) { return false; } - if (!this.method3159(var5 + 128, var7, var6)) { + if (!this.method3142(var5 + 128, var7, var6)) { return false; } } if (var1 > 0) { - if (!this.method3159(var5, var8, var6)) { + if (!this.method3142(var5, var8, var6)) { return false; } - if (!this.method3159(var5 + 128, var8, var6)) { + if (!this.method3142(var5 + 128, var8, var6)) { return false; } } - if (!this.method3159(var5, var9, var6)) { + if (!this.method3142(var5, var9, var6)) { return false; } - if (!this.method3159(var5 + 128, var9, var6)) { + if (!this.method3142(var5 + 128, var9, var6)) { return false; } @@ -2289,49 +2288,49 @@ public class Scene { } } - if (!this.method3159(var5 + 64, var10, var6 + 64)) { + if (!this.method3142(var5 + 64, var10, var6 + 64)) { return false; } else if (var4 == 16) { - return this.method3159(var5, var9, var6 + 128); + return this.method3142(var5, var9, var6 + 128); } else if (var4 == 32) { - return this.method3159(var5 + 128, var9, var6 + 128); + return this.method3142(var5 + 128, var9, var6 + 128); } else if (var4 == 64) { - return this.method3159(var5 + 128, var9, var6); + return this.method3142(var5 + 128, var9, var6); } else if (var4 == 128) { - return this.method3159(var5, var9, var6); + return this.method3142(var5, var9, var6); } else { return true; } } } - @ObfuscatedName("bx") - boolean method3157(int var1, int var2, int var3, int var4) { - if (!this.method3216(var1, var2, var3)) { + @ObfuscatedName("bl") + boolean method3170(int var1, int var2, int var3, int var4) { + if (!this.method3138(var1, var2, var3)) { return false; } else { int var5 = var2 << 7; int var6 = var3 << 7; - return this.method3159(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method3159(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method3159(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method3159(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); + return this.method3142(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method3142(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method3142(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method3142(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); } } - @ObfuscatedName("bu") - boolean method3158(int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("bq") + boolean method3200(int var1, int var2, int var3, int var4, int var5, int var6) { int var7; int var8; if (var3 == var2 && var5 == var4) { - if (!this.method3216(var1, var2, var4)) { + if (!this.method3138(var1, var2, var4)) { return false; } else { var7 = var2 << 7; var8 = var4 << 7; - return this.method3159(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method3159(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method3159(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method3159(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); + return this.method3142(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method3142(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method3142(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method3142(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); } } else { for (var7 = var2; var7 <= var3; ++var7) { for (var8 = var4; var8 <= var5; ++var8) { - if (this.field1800[var1][var7][var8] == -Scene_drawnCount) { + if (this.field1786[var1][var7][var8] == -Scene_drawnCount) { return false; } } @@ -2340,17 +2339,17 @@ public class Scene { var7 = (var2 << 7) + 1; var8 = (var4 << 7) + 2; int var9 = this.tileHeights[var1][var2][var4] - var6; - if (!this.method3159(var7, var9, var8)) { + if (!this.method3142(var7, var9, var8)) { return false; } else { int var10 = (var3 << 7) - 1; - if (!this.method3159(var10, var9, var8)) { + if (!this.method3142(var10, var9, var8)) { return false; } else { int var11 = (var5 << 7) - 1; - if (!this.method3159(var7, var9, var11)) { + if (!this.method3142(var7, var9, var11)) { return false; - } else if (!this.method3159(var10, var9, var11)) { + } else if (!this.method3142(var10, var9, var11)) { return false; } else { return true; @@ -2360,8 +2359,8 @@ public class Scene { } } - @ObfuscatedName("bd") - boolean method3159(int var1, int var2, int var3) { + @ObfuscatedName("bx") + boolean method3142(int var1, int var2, int var3) { for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { Occluder var5 = Scene_currentOccluders[var4]; int var6; @@ -2369,57 +2368,57 @@ public class Scene { int var8; int var9; int var10; - if (var5.field1896 == 1) { + if (var5.field1877 == 1) { var6 = var5.minX - var1; if (var6 > 0) { - var7 = (var6 * var5.field1900 >> 8) + var5.minZ; - var8 = (var6 * var5.field1890 >> 8) + var5.maxZ; - var9 = (var6 * var5.field1901 >> 8) + var5.minY; - var10 = (var6 * var5.field1902 >> 8) + var5.maxY; + var7 = (var6 * var5.field1880 >> 8) + var5.minZ; + var8 = (var6 * var5.field1881 >> 8) + var5.maxZ; + var9 = (var6 * var5.field1875 >> 8) + var5.minY; + var10 = (var6 * var5.field1872 >> 8) + var5.maxY; if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field1896 == 2) { + } else if (var5.field1877 == 2) { var6 = var1 - var5.minX; if (var6 > 0) { - var7 = (var6 * var5.field1900 >> 8) + var5.minZ; - var8 = (var6 * var5.field1890 >> 8) + var5.maxZ; - var9 = (var6 * var5.field1901 >> 8) + var5.minY; - var10 = (var6 * var5.field1902 >> 8) + var5.maxY; + var7 = (var6 * var5.field1880 >> 8) + var5.minZ; + var8 = (var6 * var5.field1881 >> 8) + var5.maxZ; + var9 = (var6 * var5.field1875 >> 8) + var5.minY; + var10 = (var6 * var5.field1872 >> 8) + var5.maxY; if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field1896 == 3) { + } else if (var5.field1877 == 3) { var6 = var5.minZ - var3; if (var6 > 0) { - var7 = (var6 * var5.field1897 >> 8) + var5.minX; - var8 = (var6 * var5.field1898 >> 8) + var5.maxX; - var9 = (var6 * var5.field1901 >> 8) + var5.minY; - var10 = (var6 * var5.field1902 >> 8) + var5.maxY; + var7 = (var6 * var5.field1878 >> 8) + var5.minX; + var8 = (var6 * var5.field1879 >> 8) + var5.maxX; + var9 = (var6 * var5.field1875 >> 8) + var5.minY; + var10 = (var6 * var5.field1872 >> 8) + var5.maxY; if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field1896 == 4) { + } else if (var5.field1877 == 4) { var6 = var3 - var5.minZ; if (var6 > 0) { - var7 = (var6 * var5.field1897 >> 8) + var5.minX; - var8 = (var6 * var5.field1898 >> 8) + var5.maxX; - var9 = (var6 * var5.field1901 >> 8) + var5.minY; - var10 = (var6 * var5.field1902 >> 8) + var5.maxY; + var7 = (var6 * var5.field1878 >> 8) + var5.minX; + var8 = (var6 * var5.field1879 >> 8) + var5.maxX; + var9 = (var6 * var5.field1875 >> 8) + var5.minY; + var10 = (var6 * var5.field1872 >> 8) + var5.maxY; if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field1896 == 5) { + } else if (var5.field1877 == 5) { var6 = var2 - var5.minY; if (var6 > 0) { - var7 = (var6 * var5.field1897 >> 8) + var5.minX; - var8 = (var6 * var5.field1898 >> 8) + var5.maxX; - var9 = (var6 * var5.field1900 >> 8) + var5.minZ; - var10 = (var6 * var5.field1890 >> 8) + var5.maxZ; + var7 = (var6 * var5.field1878 >> 8) + var5.minX; + var8 = (var6 * var5.field1879 >> 8) + var5.maxX; + var9 = (var6 * var5.field1880 >> 8) + var5.minZ; + var10 = (var6 * var5.field1881 >> 8) + var5.maxZ; if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { return true; } @@ -2430,7 +2429,7 @@ public class Scene { return false; } - @ObfuscatedName("g") + @ObfuscatedName("w") @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(); @@ -2448,7 +2447,7 @@ public class Scene { Scene_planeOccluders[var0][Scene_planeOccluderCounts[var0]++] = var8; } - @ObfuscatedName("ac") + @ObfuscatedName("al") @Export("Scene_buildVisiblityMap") public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int var3, int var4) { Scene_viewportXMin = 0; @@ -2481,7 +2480,7 @@ public class Scene { boolean var14 = false; for (int var15 = -var1; var15 <= var2; var15 += 128) { - if (method3284(var12, var0[var8] + var15, var13)) { + if (method3100(var12, var0[var8] + var15, var13)) { var14 = true; break; } @@ -2532,8 +2531,8 @@ public class Scene { } - @ObfuscatedName("az") - static boolean method3284(int var0, int var1, int var2) { + @ObfuscatedName("ae") + static boolean method3100(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; @@ -2547,19 +2546,19 @@ public class Scene { } } - @ObfuscatedName("aj") - public static boolean method3146() { + @ObfuscatedName("ax") + public static boolean method3092() { return viewportWalking && Scene_selectedX != -1; } - @ObfuscatedName("ap") - public static void method3147() { + @ObfuscatedName("at") + public static void method3150() { Scene_selectedX = -1; viewportWalking = false; } - @ObfuscatedName("au") - static final int method3152(int var0, int var1) { + @ObfuscatedName("ab") + static final int method3135(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; if (var1 < 2) { var1 = 2; @@ -2570,7 +2569,7 @@ public class Scene { return (var0 & 65408) + var1; } - @ObfuscatedName("as") + @ObfuscatedName("bj") @Export("containsBounds") static boolean containsBounds(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { if (var1 < var2 && var1 < var3 && var1 < var4) { diff --git a/runescape-client/src/main/java/Script.java b/runescape-client/src/main/java/Script.java index 063dae3e0a..f86732d31a 100644 --- a/runescape-client/src/main/java/Script.java +++ b/runescape-client/src/main/java/Script.java @@ -4,51 +4,63 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ci") +@ObfuscatedName("cu") @Implements("Script") public class Script extends DualNode { - @ObfuscatedName("u") + @ObfuscatedName("st") @ObfuscatedSignature( - signature = "Lef;" + signature = "Le;" + ) + @Export("grandExchangeEvents") + static GrandExchangeEvents grandExchangeEvents; + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "Leb;" ) @Export("Script_cached") static EvictingDualNodeHashTable Script_cached; - @ObfuscatedName("f") - @Export("opcodes") - int[] opcodes; - @ObfuscatedName("b") - @Export("intOperands") - int[] intOperands; - @ObfuscatedName("g") - @Export("stringOperands") - String[] stringOperands; @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1633620765 + intValue = -1585175051 + ) + @Export("loginBoxCenter") + static int loginBoxCenter; + @ObfuscatedName("i") + @Export("opcodes") + int[] opcodes; + @ObfuscatedName("y") + @Export("intOperands") + int[] intOperands; + @ObfuscatedName("w") + @Export("stringOperands") + String[] stringOperands; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 465356471 ) @Export("localIntCount") int localIntCount; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 212878753 + intValue = -1243420491 ) @Export("localStringCount") int localStringCount; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -133776919 + intValue = -308424659 ) @Export("intArgumentCount") int intArgumentCount; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 329828895 + intValue = -2632789 ) @Export("stringArgumentCount") int stringArgumentCount; - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "[Llb;" + signature = "[Llc;" ) @Export("switches") IterableNodeHashTable[] switches; @@ -60,83 +72,34 @@ public class Script extends DualNode { Script() { } - @ObfuscatedName("z") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(II)[Llb;", - garbageValue = "-135060615" + signature = "(IB)[Llc;", + garbageValue = "-1" ) @Export("newIterableNodeHashTable") IterableNodeHashTable[] newIterableNodeHashTable(int var1) { return new IterableNodeHashTable[var1]; } - @ObfuscatedName("z") + @ObfuscatedName("fj") @ObfuscatedSignature( - signature = "([BIIB)Z", - garbageValue = "27" + signature = "(I)V", + garbageValue = "1158039075" ) - static final boolean method2257(byte[] var0, int var1, int var2) { - boolean var3 = true; - Buffer var4 = new Buffer(var0); - int var5 = -1; - - label69: - while (true) { - int var6 = var4.method5710(); - if (var6 == 0) { - return var3; + static final void method2244() { + if (Projectile.ClanChat_inClanChat) { + if (Calendar.clanChat != null) { + Calendar.clanChat.sort(); } - var5 += var6; - int var7 = 0; - boolean var8 = false; - - while (true) { - int var9; - while (!var8) { - var9 = var4.readUShortSmart(); - if (var9 == 0) { - continue label69; - } - - var7 += var9 - 1; - int var10 = var7 & 63; - int var11 = var7 >> 6 & 63; - int var12 = var4.readUnsignedByte() >> 2; - int var13 = var11 + var1; - int var14 = var10 + var2; - if (var13 > 0 && var14 > 0 && var13 < 103 && var14 < 103) { - ObjectDefinition var15 = Occluder.getObjectDefinition(var5); - if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) { - if (!var15.needsModelFiles()) { - ++Client.field850; - var3 = false; - } - - var8 = true; - } - } - } - - var9 = var4.readUShortSmart(); - if (var9 == 0) { - break; - } - - var4.readUnsignedByte(); + for (int var0 = 0; var0 < Players.Players_count; ++var0) { + Player var1 = Client.players[Players.Players_indices[var0]]; + var1.clearIsInClanChat(); } - } - } - @ObfuscatedName("jk") - @ObfuscatedSignature( - signature = "(IIIIIIII)V", - garbageValue = "-1415762573" - ) - @Export("updateRootInterface") - static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (UserComparator3.loadInterface(var0)) { - UserComparator9.updateInterface(FloorDecoration.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); + Projectile.ClanChat_inClanChat = false; } + } } diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java index fb38b0dd31..cc89601b8a 100644 --- a/runescape-client/src/main/java/ScriptEvent.java +++ b/runescape-client/src/main/java/ScriptEvent.java @@ -4,68 +4,74 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("by") +@ObfuscatedName("bm") @Implements("ScriptEvent") public class ScriptEvent extends Node { - @ObfuscatedName("u") + @ObfuscatedName("fw") + @ObfuscatedGetter( + intValue = -2041683927 + ) + @Export("baseY") + static int baseY; + @ObfuscatedName("f") @Export("args") Object[] args; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("isMouseInputEvent") boolean isMouseInputEvent; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lhl;" + signature = "Lha;" ) @Export("widget") Widget widget; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1134113153 + intValue = 884179391 ) @Export("mouseX") int mouseX; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1207275519 + intValue = 990811435 ) @Export("mouseY") int mouseY; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1547508789 + intValue = 1259454631 ) @Export("opIndex") int opIndex; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lhl;" + signature = "Lha;" ) @Export("dragTarget") Widget dragTarget; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 74638955 + intValue = 49600395 ) @Export("keyTyped") int keyTyped; - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1612924995 + intValue = -601686953 ) @Export("keyPressed") int keyPressed; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("targetName") String targetName; - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -618805579 + intValue = -1957089865 ) - int field577; - @ObfuscatedName("x") + int field557; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 684866193 + intValue = 1339404961 ) @Export("type") int type; @@ -74,77 +80,118 @@ public class ScriptEvent extends Node { this.type = 76; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "([Ljava/lang/Object;I)V", - garbageValue = "1989616138" + garbageValue = "-2080962304" ) @Export("setArgs") public void setArgs(Object[] var1) { this.args = var1; } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-1172076159" + signature = "(IB)V", + garbageValue = "33" ) @Export("setType") public void setType(int var1) { this.type = var1; } - @ObfuscatedName("y") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1502841158" + signature = "(B)V", + garbageValue = "-9" ) - public static void method1198() { - try { - if (class197.field2411 == 1) { - int var0 = FaceNormal.midiPcmStream.method3769(); - if (var0 > 0 && FaceNormal.midiPcmStream.isReady()) { - var0 -= class335.field4014; - if (var0 < 0) { - var0 = 0; - } - - FaceNormal.midiPcmStream.setPcmStreamVolume(var0); - return; - } - - FaceNormal.midiPcmStream.clear(); - FaceNormal.midiPcmStream.removeAll(); - if (class197.musicTrackArchive != null) { - class197.field2411 = 2; - } else { - class197.field2411 = 0; - } - - WorldMapSprite.musicTrack = null; - NPC.soundCache = null; - } - } catch (Exception var2) { - var2.printStackTrace(); - FaceNormal.midiPcmStream.clear(); - class197.field2411 = 0; - WorldMapSprite.musicTrack = null; - NPC.soundCache = null; - class197.musicTrackArchive = null; + public static void method1183() { + if (class297.NetCache_socket != null) { + class297.NetCache_socket.close(); } } - @ObfuscatedName("ji") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lhl;B)V", - garbageValue = "-95" + signature = "(III)I", + garbageValue = "-135239713" ) - @Export("invalidateWidget") - static void invalidateWidget(Widget var0) { - if (var0.cycle == Client.field690) { - Client.field847[var0.rootIndex] = true; + static final int method1184(int var0, int var1) { + if (var0 == -2) { + return 12345678; + } else if (var0 == -1) { + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; + } + + return var1; + } else { + var1 = (var0 & 127) * var1 / 128; + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; + } + + return (var0 & 65408) + var1; + } + } + + @ObfuscatedName("gk") + @ObfuscatedSignature( + signature = "(Lbv;I)V", + garbageValue = "-2035180318" + ) + static final void method1180(Actor var0) { + int var1 = var0.field950 - Client.cycle; + int var2 = var0.field921 * 128 + var0.field925 * 64; + int var3 = var0.field966 * 128 + var0.field925 * 64; + var0.x += (var2 - var0.x) / var1; + var0.y += (var3 - var0.y) / var1; + var0.field980 = 0; + var0.orientation = var0.field970; + } + + @ObfuscatedName("hx") + @ObfuscatedSignature( + signature = "(IIII)I", + garbageValue = "1464658365" + ) + @Export("getTileHeight") + static final int getTileHeight(int var0, int var1, int var2) { + int var3 = var0 >> 7; + int var4 = var1 >> 7; + if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { + int var5 = var2; + if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { + var5 = var2 + 1; + } + + int var6 = var0 & 127; + int var7 = var1 & 127; + int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + var6 * Tiles.Tiles_heights[var5][var3 + 1][var4] >> 7; + int var9 = var6 * Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] + Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) >> 7; + return var9 * var7 + var8 * (128 - var7) >> 7; + } else { + return 0; + } + } + + @ObfuscatedName("jv") + @ObfuscatedSignature( + signature = "(IB)Z", + garbageValue = "103" + ) + static boolean method1185(int var0) { + for (int var1 = 0; var1 < Client.field849; ++var1) { + if (Client.field851[var1] == var0) { + return true; + } } + return false; } } diff --git a/runescape-client/src/main/java/ScriptFrame.java b/runescape-client/src/main/java/ScriptFrame.java index 1f86994ee2..7ff4268129 100644 --- a/runescape-client/src/main/java/ScriptFrame.java +++ b/runescape-client/src/main/java/ScriptFrame.java @@ -1,41 +1,41 @@ -import java.io.File; -import java.io.InputStream; -import java.io.OutputStreamWriter; -import java.io.RandomAccessFile; -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; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bd") +@ObfuscatedName("bk") @Implements("ScriptFrame") public class ScriptFrame { - @ObfuscatedName("du") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lij;" + signature = "Lls;" ) - @Export("archive11") - static Archive archive11; - @ObfuscatedName("u") + @Export("rightTitleSprite") + static Sprite rightTitleSprite; + @ObfuscatedName("fc") @ObfuscatedSignature( - signature = "Lci;" + signature = "Lko;" + ) + @Export("fontPlain12") + static Font fontPlain12; + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "Lcu;" ) @Export("script") Script script; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1054193233 + intValue = -894059765 ) @Export("pc") int pc; - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("intLocals") int[] intLocals; - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("stringLocals") String[] stringLocals; @@ -43,299 +43,332 @@ public class ScriptFrame { this.pc = -1; } - @ObfuscatedName("u") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)Ljava/io/File;", - garbageValue = "16" + signature = "(II)I", + garbageValue = "68267919" ) - @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("u") - @ObfuscatedSignature( - signature = "(B)J", - garbageValue = "0" - ) - static long method1162() { - try { - URL var0 = new URL(PacketBuffer.method5582("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; - } + public static int method1109(int var0) { + var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); + var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); + var0 = var0 + (var0 >>> 4) & 252645135; + var0 += var0 >>> 8; + var0 += var0 >>> 16; + return var0 & 255; } @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1620036213" + signature = "(CI)C", + garbageValue = "-1576497419" ) - static void method1163() { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - PacketWriter.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); + static char method1110(char var0) { + return var0 != 181 && var0 != 402 ? Character.toTitleCase(var0) : var0; + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + signature = "(ILcu;ZI)I", + garbageValue = "1395741259" + ) + static int method1111(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; + return 1; } else { - long var1 = method1162(); - byte var0; - if (var1 == 0L) { - var0 = 5; + int var12; + if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + var12 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var12 == 0 ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + var12 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var12 == 2 ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + var12 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var12 == 5 ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + var12 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var12 == 1 ? 1 : 0; + return 1; } 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.field1129, class80.field1130); - var7.writeByte(10); - - for (var9 = 0; var9 < 3; ++var9) { - var7.writeInt(var5.nextInt()); - } - - var7.writeLong(var5.nextLong()); - var7.writeLongMedium(var5.nextLong()); - GrandExchangeOfferTotalQuantityComparator.method104(var7); - var7.writeLong(var5.nextLong()); - var7.encryptRsa(class80.field1129, class80.field1130); - var9 = class173.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 = StudioGame.method4220(var11.array); - - byte var3; - try { - URL var13 = new URL(PacketBuffer.method5582("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()); - int var18 = var12.length(); - StringBuilder var19 = new StringBuilder(var18); - - int var20; - for (var20 = 0; var20 < var18; ++var20) { - char var21 = var12.charAt(var20); - if ((var21 < 'a' || var21 > 'z') && (var21 < 'A' || var21 > 'Z') && (var21 < '0' || var21 > '9') && var21 != '.' && var21 != '-' && var21 != '*' && var21 != '_') { - if (var21 == ' ') { - var19.append('+'); - } else { - byte var22 = Skills.charToByteCp1252(var21); - var19.append('%'); - int var23 = var22 >> 4 & 15; - if (var23 >= 10) { - var19.append((char)(var23 + 55)); - } else { - var19.append((char)(var23 + 48)); - } - - var23 = var22 & 15; - if (var23 >= 10) { - var19.append((char)(var23 + 55)); - } else { - var19.append((char)(var23 + 48)); - } - } - } else { - var19.append(var21); - } + boolean var13; + if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { + var13 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + if (Script.grandExchangeEvents != null) { + Script.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var13); } - String var17 = var19.toString(); - String var26 = "data2=" + var17 + "&dest="; - var20 = "passwordchoice.ws".length(); - StringBuilder var27 = new StringBuilder(var20); - - for (int var32 = 0; var32 < var20; ++var32) { - char var33 = "passwordchoice.ws".charAt(var32); - if ((var33 < 'a' || var33 > 'z') && (var33 < 'A' || var33 > 'Z') && (var33 < '0' || var33 > '9') && var33 != '.' && var33 != '-' && var33 != '*' && var33 != '_') { - if (var33 == ' ') { - var27.append('+'); - } else { - byte var24 = Skills.charToByteCp1252(var33); - var27.append('%'); - int var25 = var24 >> 4 & 15; - if (var25 >= 10) { - var27.append((char)(var25 + 55)); - } else { - var27.append((char)(var25 + 48)); - } - - var25 = var24 & 15; - if (var25 >= 10) { - var27.append((char)(var25 + 55)); - } else { - var27.append((char)(var25 + 48)); - } - } - } else { - var27.append(var33); - } + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { + var13 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + if (Script.grandExchangeEvents != null) { + Script.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var13); } - String var30 = var27.toString(); - var15.write(var26 + var30); - var15.flush(); - InputStream var28 = var14.getInputStream(); - var11 = new Buffer(new byte[1000]); - - while (true) { - int var31 = var28.read(var11.array, var11.offset, 1000 - var11.offset); - if (var31 == -1) { - var15.close(); - var28.close(); - String var34 = new String(var11.array); - if (var34.startsWith("OFFLINE")) { - var3 = 4; - } else if (var34.startsWith("WRONG")) { - var3 = 7; - } else if (var34.startsWith("RELOAD")) { - var3 = 3; - } else if (var34.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; - } - - var34 = new String(var11.array, 0, var11.offset); - if (WorldMapLabel.isValidURL(var34)) { - WorldMapAreaData.openURL(var34, true, false); - var3 = 2; - } else { - var3 = 5; - } - } - break; - } - - var11.offset += var31; - if (var11.offset >= 1000) { - var3 = 5; - break; - } + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { + class188.Interpreter_intStackSize -= 2; + var13 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize] == 1; + boolean var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1] == 1; + if (Script.grandExchangeEvents != null) { + Client.GrandExchangeEvents_worldComparator.filterWorlds = var4; + Script.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var13); + } + + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { + var13 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + if (Script.grandExchangeEvents != null) { + Script.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var13); + } + + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { + var13 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + if (Script.grandExchangeEvents != null) { + Script.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var13); + } + + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Script.grandExchangeEvents == null ? 0 : Script.grandExchangeEvents.events.size(); + return 1; + } else { + GrandExchangeEvent var11; + if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)Script.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var11.world; + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)Script.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var11.getOfferName(); + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)Script.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var11.getPreviousOfferName(); + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)Script.grandExchangeEvents.events.get(var3); + long var5 = WorldMapID.currentTimeMillis() - TileItemPile.field1522 - var11.age; + int var7 = (int)(var5 / 3600000L); + int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); + int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); + String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var10; + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)Script.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.totalQuantity; + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)Script.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.unitPrice; + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)Script.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.id; + return 1; + } else { + return 2; } - } catch (Throwable var29) { - var29.printStackTrace(); - var3 = 5; } - - var0 = var3; } - - switch(var0) { - case 2: - PacketWriter.setLoginResponseString(Strings.field2912, Strings.field3039, Strings.field2786); - Login.loginIndex = 6; - break; - case 3: - PacketWriter.setLoginResponseString("", "Error connecting to server.", ""); - break; - case 4: - PacketWriter.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); - break; - case 5: - PacketWriter.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); - break; - case 6: - PacketWriter.setLoginResponseString("", "Error connecting to server.", ""); - break; - case 7: - PacketWriter.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("an") + @ObfuscatedSignature( + signature = "(ILcu;ZI)I", + garbageValue = "-2033386176" + ) + static int method1112(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.OC_NAME) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = PacketBufferNode.ItemDefinition_get(var3).name; + return 1; + } else { + int var4; + ItemDefinition var5; + if (var0 == ScriptOpcodes.OC_OP) { + class188.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + var5 = PacketBufferNode.ItemDefinition_get(var3); + if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_IOP) { + class188.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + var5 = PacketBufferNode.ItemDefinition_get(var3); + if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_COST) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = PacketBufferNode.ItemDefinition_get(var3).price; + return 1; + } else if (var0 == ScriptOpcodes.OC_STACKABLE) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = PacketBufferNode.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; + return 1; + } else { + ItemDefinition var6; + if (var0 == ScriptOpcodes.OC_CERT) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + var6 = PacketBufferNode.ItemDefinition_get(var3); + if (var6.noteTemplate == -1 && var6.note >= 0) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var6.note; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_UNCERT) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + var6 = PacketBufferNode.ItemDefinition_get(var3); + if (var6.noteTemplate >= 0 && var6.note >= 0) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var6.note; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_MEMBERS) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = PacketBufferNode.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + var6 = PacketBufferNode.ItemDefinition_get(var3); + if (var6.placeholderTemplate == -1 && var6.placeholder >= 0) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var6.placeholder; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + var6 = PacketBufferNode.ItemDefinition_get(var3); + if (var6.placeholderTemplate >= 0 && var6.placeholder >= 0) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var6.placeholder; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_FIND) { + String var7 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + WorldMapSectionType.findItemDefinitions(var7, var4 == 1); + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = KeyHandler.foundItemIdCount; + return 1; + } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { + if (var0 == ScriptOpcodes.OC_FINDRESET) { + class189.foundItemIndex = 0; + return 1; + } else { + return 2; + } + } else { + if (class269.foundItemIds != null && class189.foundItemIndex < KeyHandler.foundItemIdCount) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = class269.foundItemIds[++class189.foundItemIndex - 1] & '\uffff'; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; + } + + return 1; + } + } + } + } + + @ObfuscatedName("fi") + @ObfuscatedSignature( + signature = "(III)V", + garbageValue = "1546700501" + ) + @Export("playSoundJingle") + static void playSoundJingle(int var0, int var1) { + if (Client.musicVolume != 0 && var0 != -1) { + class173.playMusicTrack(class48.archive11, var0, 0, Client.musicVolume, false); + Client.field767 = true; + } + + } + + @ObfuscatedName("ki") + @ObfuscatedSignature( + signature = "(IIII)Lbz;", + garbageValue = "-1435666355" + ) + static final InterfaceParent method1107(int var0, int var1, int var2) { + InterfaceParent var3 = new InterfaceParent(); + var3.group = var1; + var3.type = var2; + Client.interfaceParents.put(var3, (long)var0); + GameShell.Widget_resetModelFrames(var1); + Widget var4 = Tile.getWidget(var0); + LoginPacket.invalidateWidget(var4); + if (Client.meslayerContinueWidget != null) { + LoginPacket.invalidateWidget(Client.meslayerContinueWidget); + Client.meslayerContinueWidget = null; + } + + Strings.method4096(); + Messages.revalidateWidgetScroll(UserComparator7.Widget_interfaceComponents[var0 >> 16], var4, false); + Players.runWidgetOnLoadListener(var1); + if (Client.rootInterface != -1) { + ItemContainer.runIntfCloseListeners(Client.rootInterface, 1); + } + + return var3; + } } diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java index f6f119c240..652e515374 100644 --- a/runescape-client/src/main/java/SecureRandomCallable.java +++ b/runescape-client/src/main/java/SecureRandomCallable.java @@ -1,233 +1,187 @@ 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; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bn") +@ObfuscatedName("bq") @Implements("SecureRandomCallable") public class SecureRandomCallable implements Callable { - @ObfuscatedName("ej") - @ObfuscatedGetter( - intValue = -276415833 + @ObfuscatedName("de") + @ObfuscatedSignature( + signature = "Lfu;" ) - @Export("port1") - static int port1; + @Export("js5SocketTask") + static Task js5SocketTask; + @ObfuscatedName("ej") + @ObfuscatedSignature( + signature = "Lkc;" + ) + @Export("spriteIds") + static GraphicsDefaults spriteIds; SecureRandomCallable() { } public Object call() { - return NetCache.method4394(); + return GameShell.method1069(); } - @ObfuscatedName("b") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-2092975703" + signature = "(IB)Lcu;", + garbageValue = "-120" ) - @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("p") - @ObfuscatedSignature( - signature = "(ILci;ZI)I", - garbageValue = "-1914029993" - ) - static int method1171(int var0, Script var1, boolean var2) { - int var4 = -1; - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var4 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var3 = Language.getWidget(var4); + @Export("getScript") + static Script getScript(int var0) { + Script var1 = (Script)Script.Script_cached.get((long)var0); + if (var1 != null) { + return var1; } else { - var3 = var2 ? Interpreter.field1090 : class188.field2352; - } - - if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var3.scrollX = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.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[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - if (var3.scrollY > var3.scrollHeight - var3.height) { - var3.scrollY = var3.scrollHeight - var3.height; - } - - if (var3.scrollY < 0) { - var3.scrollY = 0; - } - - ScriptEvent.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { - var3.color = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - ScriptEvent.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETFILL) { - var3.fill = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - ScriptEvent.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTRANS) { - var3.transparencyTop = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - ScriptEvent.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { - var3.lineWid = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - ScriptEvent.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { - var3.spriteId2 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - ScriptEvent.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { - var3.spriteAngle = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - ScriptEvent.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTILING) { - var3.spriteTiling = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - ScriptEvent.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETMODEL) { - var3.modelType = 1; - var3.modelId = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - ScriptEvent.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 6; - var3.modelOffsetX = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var3.modelOffsetY = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - var3.modelAngleX = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 2]; - var3.modelAngleY = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 3]; - var3.modelAngleZ = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 4]; - var3.modelZoom = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 5]; - ScriptEvent.invalidateWidget(var3); - return 1; - } else { - int var8; - if (var0 == ScriptOpcodes.CC_SETMODELANIM) { - var8 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - if (var8 != var3.sequenceId) { - var3.sequenceId = var8; - var3.modelFrame = 0; - var3.modelFrameCycle = 0; - ScriptEvent.invalidateWidget(var3); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { - var3.modelOrthog = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - ScriptEvent.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTEXT) { - String var7 = Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]; - if (!var7.equals(var3.text)) { - var3.text = var7; - ScriptEvent.invalidateWidget(var3); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { - var3.fontId = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - ScriptEvent.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 3; - var3.textXAlignment = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var3.textYAlignment = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - var3.textLineHeight = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 2]; - ScriptEvent.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { - var3.textShadowed = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - ScriptEvent.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { - var3.outline = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - ScriptEvent.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { - var3.spriteShadow = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - ScriptEvent.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { - var3.spriteFlipV = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - ScriptEvent.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { - var3.spriteFlipH = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - ScriptEvent.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var3.scrollWidth = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var3.scrollHeight = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - ScriptEvent.invalidateWidget(var3); - if (var4 != -1 && var3.type == 0) { - MilliClock.revalidateWidgetScroll(FloorDecoration.Widget_interfaceComponents[var4 >> 16], var3, false); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { - WorldMapCacheName.resumePauseWidget(var3.id, var3.childIndex); - Client.meslayerContinueWidget = var3; - ScriptEvent.invalidateWidget(var3); - return 1; - } else if (var0 == 1122) { - var3.spriteId = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - ScriptEvent.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { - var3.color2 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - ScriptEvent.invalidateWidget(var3); - return 1; - } else if (var0 == 1124) { - var3.transparencyBot = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - ScriptEvent.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETFILLMODE) { - var8 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - FillMode var6 = (FillMode)CollisionMap.findEnumerated(TileItem.FillMode_values(), var8); - if (var6 != null) { - var3.fillMode = var6; - ScriptEvent.invalidateWidget(var3); - } - - return 1; + byte[] var2 = SoundSystem.archive12.takeFile(var0, 0); + if (var2 == null) { + return null; } else { - boolean var5; - if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { - var5 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - var3.field2709 = var5; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { - var5 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - var3.modelTransparency = var5; - return 1; - } else { - return 2; - } + var1 = Tiles.newScript(var2); + Script.Script_cached.put(var1, (long)var0); + return var1; } } } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(Lhz;II)Lli;", + garbageValue = "-210217349" + ) + public static IndexedSprite method1151(AbstractArchive var0, int var1) { + return !class4.method61(var0, var1) ? null : WorldMapDecoration.method327(); + } + + @ObfuscatedName("hg") + @ObfuscatedSignature( + signature = "(ZLkl;B)V", + garbageValue = "-23" + ) + @Export("loadRegions") + static final void loadRegions(boolean var0, PacketBuffer var1) { + Client.isInInstance = var0; + int var3; + int var4; + int var5; + int var6; + int var7; + int var8; + if (!Client.isInInstance) { + int var2 = var1.method5723(); + var3 = var1.method5582(); + var4 = var1.readUnsignedShort(); + Canvas.xteaKeys = new int[var4][4]; + + for (var5 = 0; var5 < var4; ++var5) { + for (var6 = 0; var6 < 4; ++var6) { + Canvas.xteaKeys[var5][var6] = var1.readInt(); + } + } + + WorldMapSection2.regions = new int[var4]; + SecureRandomFuture.regionMapArchiveIds = new int[var4]; + class222.regionLandArchiveIds = new int[var4]; + Projectile.regionLandArchives = new byte[var4][]; + GrandExchangeOfferOwnWorldComparator.regionMapArchives = new byte[var4][]; + boolean var16 = false; + if ((var3 / 8 == 48 || var3 / 8 == 49) && var2 / 8 == 48) { + var16 = true; + } + + if (var3 / 8 == 48 && var2 / 8 == 148) { + var16 = true; + } + + var4 = 0; + + for (var6 = (var3 - 6) / 8; var6 <= (var3 + 6) / 8; ++var6) { + for (var7 = (var2 - 6) / 8; var7 <= (var2 + 6) / 8; ++var7) { + var8 = var7 + (var6 << 8); + if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) { + WorldMapSection2.regions[var4] = var8; + SecureRandomFuture.regionMapArchiveIds[var4] = AbstractWorldMapData.archive5.getGroupId("m" + var6 + "_" + var7); + class222.regionLandArchiveIds[var4] = AbstractWorldMapData.archive5.getGroupId("l" + var6 + "_" + var7); + ++var4; + } + } + } + + UserComparator8.method3327(var3, var2, true); + } else { + boolean var15 = var1.method5675() == 1; + var3 = var1.method5583(); + var4 = var1.readUnsignedShort(); + var5 = var1.readUnsignedShort(); + var1.importIndex(); + + int var9; + for (var6 = 0; var6 < 4; ++var6) { + for (var7 = 0; var7 < 13; ++var7) { + for (var8 = 0; var8 < 13; ++var8) { + var9 = var1.readBits(1); + if (var9 == 1) { + Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); + } else { + Client.instanceChunkTemplates[var6][var7][var8] = -1; + } + } + } + } + + var1.exportIndex(); + Canvas.xteaKeys = new int[var5][4]; + + for (var6 = 0; var6 < var5; ++var6) { + for (var7 = 0; var7 < 4; ++var7) { + Canvas.xteaKeys[var6][var7] = var1.readInt(); + } + } + + WorldMapSection2.regions = new int[var5]; + SecureRandomFuture.regionMapArchiveIds = new int[var5]; + class222.regionLandArchiveIds = new int[var5]; + Projectile.regionLandArchives = new byte[var5][]; + GrandExchangeOfferOwnWorldComparator.regionMapArchives = new byte[var5][]; + var5 = 0; + + for (var6 = 0; var6 < 4; ++var6) { + for (var7 = 0; var7 < 13; ++var7) { + for (var8 = 0; var8 < 13; ++var8) { + var9 = Client.instanceChunkTemplates[var6][var7][var8]; + if (var9 != -1) { + int var10 = var9 >> 14 & 1023; + int var11 = var9 >> 3 & 2047; + int var12 = (var10 / 8 << 8) + var11 / 8; + + int var13; + for (var13 = 0; var13 < var5; ++var13) { + if (WorldMapSection2.regions[var13] == var12) { + var12 = -1; + break; + } + } + + if (var12 != -1) { + WorldMapSection2.regions[var5] = var12; + var13 = var12 >> 8 & 255; + int var14 = var12 & 255; + SecureRandomFuture.regionMapArchiveIds[var5] = AbstractWorldMapData.archive5.getGroupId("m" + var13 + "_" + var14); + class222.regionLandArchiveIds[var5] = AbstractWorldMapData.archive5.getGroupId("l" + var13 + "_" + var14); + ++var5; + } + } + } + } + } + + UserComparator8.method3327(var4, var3, !var15); + } + + } } diff --git a/runescape-client/src/main/java/SecureRandomFuture.java b/runescape-client/src/main/java/SecureRandomFuture.java index 3c9a2e3161..080fd4b34f 100644 --- a/runescape-client/src/main/java/SecureRandomFuture.java +++ b/runescape-client/src/main/java/SecureRandomFuture.java @@ -4,28 +4,19 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; 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("cy") +@ObfuscatedName("cn") @Implements("SecureRandomFuture") public class SecureRandomFuture { - @ObfuscatedName("rh") - @ObfuscatedGetter( - intValue = 1810494336 - ) - static int field1242; - @ObfuscatedName("fx") - @ObfuscatedSignature( - signature = "Lfo;" - ) - @Export("socketTask") - static Task socketTask; - @ObfuscatedName("u") + @ObfuscatedName("gj") + @Export("regionMapArchiveIds") + static int[] regionMapArchiveIds; + @ObfuscatedName("f") @Export("executor") ExecutorService executor; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("future") Future future; @@ -34,10 +25,10 @@ public class SecureRandomFuture { this.future = this.executor.submit(new SecureRandomCallable()); } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "3" + signature = "(I)V", + garbageValue = "-2111243469" ) @Export("shutdown") void shutdown() { @@ -45,27 +36,99 @@ public class SecureRandomFuture { this.executor = null; } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "583924598" + signature = "(B)Z", + garbageValue = "5" ) @Export("isDone") boolean isDone() { return this.future.isDone(); } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "(B)Ljava/security/SecureRandom;", - garbageValue = "117" + garbageValue = "90" ) @Export("get") SecureRandom get() { try { return (SecureRandom)this.future.get(); } catch (Exception var2) { - return NetCache.method4394(); + return GameShell.method1069(); } } + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(Ljava/lang/CharSequence;I)Z", + garbageValue = "1990156878" + ) + @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; + while (true) { + if (var6 >= var5) { + var1 = var3; + break; + } + + label81: { + char var7 = var0.charAt(var6); + if (var6 == 0) { + if (var7 == '-') { + var2 = true; + break label81; + } + + if (var7 == '+') { + break label81; + } + } + + 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; + } + + var9 = var7 - 'W'; + } + + if (var9 >= 10) { + var1 = false; + break; + } + + if (var2) { + var9 = -var9; + } + + int var8 = var4 * 10 + var9; + if (var4 != var8 / 10) { + var1 = false; + break; + } + + var4 = var8; + var3 = true; + } + + ++var6; + } + + return var1; + } } diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java index c6613e1a98..d9b7bb770f 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("iy") +@ObfuscatedName("iv") @Implements("SequenceDefinition") public class SequenceDefinition extends DualNode { - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lhf;" + @ObfuscatedName("qi") + @ObfuscatedGetter( + intValue = 364724224 ) - @Export("SequenceDefinition_archive") - static AbstractArchive SequenceDefinition_archive; + static int field3477; @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lhf;" + signature = "Lhz;" + ) + @Export("SequenceDefinition_archive") + public static AbstractArchive SequenceDefinition_archive; + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "Lhz;" ) @Export("SequenceDefinition_animationsArchive") - static AbstractArchive SequenceDefinition_animationsArchive; - @ObfuscatedName("b") + public static AbstractArchive SequenceDefinition_animationsArchive; + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lhf;" + signature = "Lhz;" ) @Export("SequenceDefinition_skeletonsArchive") - static AbstractArchive SequenceDefinition_skeletonsArchive; - @ObfuscatedName("g") + public static AbstractArchive SequenceDefinition_skeletonsArchive; + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lef;" + signature = "Leb;" ) @Export("SequenceDefinition_cached") - public static EvictingDualNodeHashTable SequenceDefinition_cached; - @ObfuscatedName("z") + static EvictingDualNodeHashTable SequenceDefinition_cached; + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lef;" + signature = "Leb;" ) @Export("SequenceDefinition_cachedFrames") - public static EvictingDualNodeHashTable SequenceDefinition_cachedFrames; - @ObfuscatedName("gr") - @ObfuscatedSignature( - signature = "[Lln;" - ) - @Export("headIconHintSprites") - static Sprite[] headIconHintSprites; - @ObfuscatedName("p") + static EvictingDualNodeHashTable SequenceDefinition_cachedFrames; + @ObfuscatedName("b") @Export("frameIds") public int[] frameIds; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("chatFrameIds") int[] chatFrameIds; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("frameLengths") public int[] frameLengths; - @ObfuscatedName("w") + @ObfuscatedName("a") @Export("soundEffects") public int[] soundEffects; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1382390397 + intValue = 626636947 ) @Export("frameCount") public int frameCount; - @ObfuscatedName("k") - int[] field3525; - @ObfuscatedName("x") - public boolean field3523; + @ObfuscatedName("c") + int[] field3487; @ObfuscatedName("o") + public boolean field3488; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1226148923 + intValue = -796386043 ) - public int field3527; - @ObfuscatedName("e") + public int field3492; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1315195187 + intValue = -2083462623 ) @Export("shield") public int shield; - @ObfuscatedName("n") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -756969187 + intValue = -520888257 ) @Export("weapon") public int weapon; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -651997909 + intValue = -569309439 ) - public int field3516; - @ObfuscatedName("c") + public int field3496; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 613007297 + intValue = -877726895 ) - public int field3531; - @ObfuscatedName("a") + public int field3478; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1604806417 + intValue = -134908293 ) - public int field3515; - @ObfuscatedName("d") + public int field3493; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -441641943 + intValue = -1454093345 ) - public int field3533; + public int field3495; static { SequenceDefinition_cached = new EvictingDualNodeHashTable(64); @@ -110,20 +109,20 @@ public class SequenceDefinition extends DualNode { SequenceDefinition() { this.frameCount = -1; - this.field3523 = false; - this.field3527 = 5; + this.field3488 = false; + this.field3492 = 5; this.shield = -1; this.weapon = -1; - this.field3516 = 99; - this.field3531 = -1; - this.field3515 = -1; - this.field3533 = 2; + this.field3496 = 99; + this.field3478 = -1; + this.field3493 = -1; + this.field3495 = 2; } - @ObfuscatedName("b") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkg;B)V", - garbageValue = "-2" + signature = "(Lkq;I)V", + garbageValue = "469124776" ) @Export("decode") void decode(Buffer var1) { @@ -137,10 +136,10 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Lkg;II)V", - garbageValue = "-474728171" + signature = "(Lkq;II)V", + garbageValue = "62604408" ) @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.field3525 = new int[var3 + 1]; + this.field3487 = new int[var3 + 1]; for (var4 = 0; var4 < var3; ++var4) { - this.field3525[var4] = var1.readUnsignedByte(); + this.field3487[var4] = var1.readUnsignedByte(); } - this.field3525[var3] = 9999999; + this.field3487[var3] = 9999999; } else if (var2 == 4) { - this.field3523 = true; + this.field3488 = true; } else if (var2 == 5) { - this.field3527 = var1.readUnsignedByte(); + this.field3492 = var1.readUnsignedByte(); } else if (var2 == 6) { this.shield = var1.readUnsignedShort(); } else if (var2 == 7) { this.weapon = var1.readUnsignedShort(); } else if (var2 == 8) { - this.field3516 = var1.readUnsignedByte(); + this.field3496 = var1.readUnsignedByte(); } else if (var2 == 9) { - this.field3531 = var1.readUnsignedByte(); + this.field3478 = var1.readUnsignedByte(); } else if (var2 == 10) { - this.field3515 = var1.readUnsignedByte(); + this.field3493 = var1.readUnsignedByte(); } else if (var2 == 11) { - this.field3533 = var1.readUnsignedByte(); + this.field3495 = var1.readUnsignedByte(); } else if (var2 == 12) { var3 = var1.readUnsignedByte(); this.chatFrameIds = new int[var3]; @@ -212,26 +211,26 @@ public class SequenceDefinition extends DualNode { } - @ObfuscatedName("z") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-12" + signature = "(I)V", + garbageValue = "-1097095520" ) @Export("postDecode") void postDecode() { - if (this.field3531 == -1) { - if (this.field3525 != null) { - this.field3531 = 2; + if (this.field3478 == -1) { + if (this.field3487 != null) { + this.field3478 = 2; } else { - this.field3531 = 0; + this.field3478 = 0; } } - if (this.field3515 == -1) { - if (this.field3525 != null) { - this.field3515 = 2; + if (this.field3493 == -1) { + if (this.field3487 != null) { + this.field3493 = 2; } else { - this.field3515 = 0; + this.field3493 = 0; } } @@ -239,13 +238,13 @@ public class SequenceDefinition extends DualNode { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Ldf;IB)Ldf;", - garbageValue = "33" + signature = "(Ldw;II)Ldw;", + garbageValue = "903952456" ) @Export("transformActorModel") public Model transformActorModel(Model var1, int var2) { var2 = this.frameIds[var2]; - Frames var3 = Canvas.getFrames(var2 >> 16); + Frames var3 = class4.getFrames(var2 >> 16); var2 &= 65535; if (var3 == null) { return var1.toSharedSequenceModel(true); @@ -256,15 +255,15 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(Ldf;III)Ldf;", - garbageValue = "-551635617" + signature = "(Ldw;III)Ldw;", + garbageValue = "-118800541" ) @Export("transformObjectModel") Model transformObjectModel(Model var1, int var2, int var3) { var2 = this.frameIds[var2]; - Frames var4 = Canvas.getFrames(var2 >> 16); + Frames var4 = class4.getFrames(var2 >> 16); var2 &= 65535; if (var4 == null) { return var1.toSharedSequenceModel(true); @@ -292,15 +291,15 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("y") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Ldf;II)Ldf;", - garbageValue = "1568692010" + signature = "(Ldw;II)Ldw;", + garbageValue = "103025381" ) @Export("transformSpotAnimationModel") Model transformSpotAnimationModel(Model var1, int var2) { var2 = this.frameIds[var2]; - Frames var3 = Canvas.getFrames(var2 >> 16); + Frames var3 = class4.getFrames(var2 >> 16); var2 &= 65535; if (var3 == null) { return var1.toSharedSpotAnimationModel(true); @@ -311,21 +310,21 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("w") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Ldf;ILiy;IS)Ldf;", - garbageValue = "-1911" + signature = "(Ldw;ILiv;IB)Ldw;", + garbageValue = "118" ) @Export("applyTransformations") public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, int var4) { var2 = this.frameIds[var2]; - Frames var5 = Canvas.getFrames(var2 >> 16); + Frames var5 = class4.getFrames(var2 >> 16); var2 &= 65535; if (var5 == null) { return var3.transformActorModel(var1, var4); } else { var4 = var3.frameIds[var4]; - Frames var6 = Canvas.getFrames(var4 >> 16); + Frames var6 = class4.getFrames(var4 >> 16); var4 &= 65535; Model var7; if (var6 == null) { @@ -334,21 +333,21 @@ public class SequenceDefinition extends DualNode { return var7; } else { var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4)); - var7.animate2(var5, var2, var6, var4, this.field3525); + var7.animate2(var5, var2, var6, var4, this.field3487); return var7; } } } - @ObfuscatedName("i") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(Ldf;II)Ldf;", - garbageValue = "1087252773" + signature = "(Ldw;IB)Ldw;", + garbageValue = "58" ) @Export("transformWidgetModel") public Model transformWidgetModel(Model var1, int var2) { int var3 = this.frameIds[var2]; - Frames var4 = Canvas.getFrames(var3 >> 16); + Frames var4 = class4.getFrames(var3 >> 16); var3 &= 65535; if (var4 == null) { return var1.toSharedSequenceModel(true); @@ -357,7 +356,7 @@ public class SequenceDefinition extends DualNode { int var6 = 0; if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) { var6 = this.chatFrameIds[var2]; - var5 = Canvas.getFrames(var6 >> 16); + var5 = class4.getFrames(var6 >> 16); var6 &= 65535; } @@ -375,13 +374,41 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("y") + @ObfuscatedName("hl") @ObfuscatedSignature( - signature = "(CI)Z", - garbageValue = "-816742084" + signature = "(Lbh;B)V", + garbageValue = "47" ) - @Export("isCharAlphabetic") - public static boolean isCharAlphabetic(char var0) { - return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; + static final void method4821(PendingSpawn var0) { + long var1 = 0L; + int var3 = -1; + int var4 = 0; + int var5 = 0; + if (var0.type == 0) { + var1 = class14.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 1) { + var1 = class14.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 2) { + var1 = class14.scene.getGameObjectTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 3) { + var1 = class14.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); + } + + if (var1 != 0L) { + int var6 = class14.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); + var3 = class2.Entity_unpackID(var1); + var4 = var6 & 31; + var5 = var6 >> 6 & 3; + } + + var0.objectId = var3; + var0.field912 = var4; + var0.field911 = var5; } } diff --git a/runescape-client/src/main/java/ServerBuild.java b/runescape-client/src/main/java/ServerBuild.java index eb566da7cb..9b552dd300 100644 --- a/runescape-client/src/main/java/ServerBuild.java +++ b/runescape-client/src/main/java/ServerBuild.java @@ -4,41 +4,47 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hz") +@ObfuscatedName("hi") @Implements("ServerBuild") public class ServerBuild { - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lhz;" - ) - @Export("LIVE") - static final ServerBuild LIVE; @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lhi;" + ) + @Export("LIVE") + public static final ServerBuild LIVE; + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "Lhi;" ) @Export("BUILDLIVE") - static final ServerBuild BUILDLIVE; - @ObfuscatedName("b") + public static final ServerBuild BUILDLIVE; + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lhi;" ) @Export("RC") - static final ServerBuild RC; - @ObfuscatedName("g") + public static final ServerBuild RC; + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lhi;" ) @Export("WIP") - static final ServerBuild WIP; - @ObfuscatedName("z") + public static final ServerBuild WIP; + @ObfuscatedName("dv") + @ObfuscatedSignature( + signature = "Lif;" + ) + @Export("archive10") + static Archive archive10; + @ObfuscatedName("p") @Export("name") public final String name; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -832726311 + intValue = 135493903 ) - public final int field3109; + public final int field3081; static { LIVE = new ServerBuild("LIVE", 0); @@ -49,20 +55,19 @@ public class ServerBuild { ServerBuild(String var1, int var2) { this.name = var1; - this.field3109 = var2; + this.field3081 = var2; } @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(Llb;ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "-88537768" - ) - static String method4214(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; + public static final void method4111(long var0) { + if (var0 > 0L) { + if (var0 % 10L == 0L) { + class188.method3604(var0 - 1L); + class188.method3604(1L); + } else { + class188.method3604(var0); + } + } } } diff --git a/runescape-client/src/main/java/ServerPacket.java b/runescape-client/src/main/java/ServerPacket.java index 20489d966b..974c752060 100644 --- a/runescape-client/src/main/java/ServerPacket.java +++ b/runescape-client/src/main/java/ServerPacket.java @@ -5,539 +5,539 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("gm") +@ObfuscatedName("fw") @Implements("ServerPacket") public class ServerPacket { - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2132; @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2185; - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2193; - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2134; - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2129; - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2156; - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2173; - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2135; - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2138; + public static final ServerPacket field2120; @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2137; - @ObfuscatedName("k") + public static final ServerPacket field2087; + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2155; - @ObfuscatedName("x") + public static final ServerPacket field2088; + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2163; - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2133; - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2151; - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2142; - @ObfuscatedName("r") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2143; - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2130; - @ObfuscatedName("a") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2145; - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2146; - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2199; - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2148; - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2149; - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2150; - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2141; - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) public static final ServerPacket field2144; - @ObfuscatedName("j") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2153; - @ObfuscatedName("af") + public static final ServerPacket field2090; + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2154; - @ObfuscatedName("ad") + public static final ServerPacket field2091; + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2198; - @ObfuscatedName("am") + public static final ServerPacket field2142; + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) public static final ServerPacket field2140; - @ObfuscatedName("ai") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2157; - @ObfuscatedName("ag") + public static final ServerPacket field2094; + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2158; - @ObfuscatedName("ao") + public static final ServerPacket field2095; + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" + ) + public static final ServerPacket field2096; + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2097; + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2098; + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2163; + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "Lfw;" ) public static final ServerPacket field2159; - @ObfuscatedName("aw") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2160; - @ObfuscatedName("ak") + public static final ServerPacket field2101; + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2161; - @ObfuscatedName("aa") + public static final ServerPacket field2149; + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" + ) + public static final ServerPacket field2173; + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2104; + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2105; + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2106; + @ObfuscatedName("h") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2138; + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2108; + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2109; + @ObfuscatedName("r") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2110; + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "Lfw;" ) public static final ServerPacket field2162; - @ObfuscatedName("ab") + @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2184; - @ObfuscatedName("ar") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2164; + public static final ServerPacket field2112; @ObfuscatedName("av") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2192; - @ObfuscatedName("aq") + public static final ServerPacket field2113; + @ObfuscatedName("aw") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2166; - @ObfuscatedName("ac") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2167; - @ObfuscatedName("az") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2168; - @ObfuscatedName("at") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2212; - @ObfuscatedName("ae") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2170; - @ObfuscatedName("aj") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2171; - @ObfuscatedName("ap") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2169; - @ObfuscatedName("an") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2136; - @ObfuscatedName("al") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2174; - @ObfuscatedName("ay") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2175; - @ObfuscatedName("ax") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2176; - @ObfuscatedName("au") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2177; + public static final ServerPacket field2114; @ObfuscatedName("as") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2178; + public static final ServerPacket field2089; + @ObfuscatedName("ak") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2116; + @ObfuscatedName("au") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2100; @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2179; - @ObfuscatedName("bi") + public static final ServerPacket field2118; + @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2180; - @ObfuscatedName("bo") + public static final ServerPacket field2119; + @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2181; - @ObfuscatedName("bx") + public static final ServerPacket field2093; + @ObfuscatedName("an") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2182; - @ObfuscatedName("bu") + public static final ServerPacket field2121; + @ObfuscatedName("ar") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2183; - @ObfuscatedName("bd") + public static final ServerPacket field2122; + @ObfuscatedName("az") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2204; - @ObfuscatedName("bn") + public static final ServerPacket field2129; + @ObfuscatedName("ay") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2152; - @ObfuscatedName("bj") + public static final ServerPacket field2124; + @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2196; - @ObfuscatedName("bm") + public static final ServerPacket field2125; + @ObfuscatedName("ac") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2187; - @ObfuscatedName("bq") + public static final ServerPacket field2126; + @ObfuscatedName("al") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2188; - @ObfuscatedName("bf") + public static final ServerPacket field2127; + @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) public static final ServerPacket field2128; - @ObfuscatedName("by") + @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2190; - @ObfuscatedName("br") + public static final ServerPacket field2164; + @ObfuscatedName("aj") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2191; - @ObfuscatedName("ba") + public static final ServerPacket field2130; + @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" + ) + public static final ServerPacket field2153; + @ObfuscatedName("at") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2132; + @ObfuscatedName("af") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2111; + @ObfuscatedName("ap") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2134; + @ObfuscatedName("ai") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2135; + @ObfuscatedName("am") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2136; + @ObfuscatedName("ab") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2161; + @ObfuscatedName("bj") + @ObfuscatedSignature( + signature = "Lfw;" ) public static final ServerPacket field2131; - @ObfuscatedName("bb") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2139; @ObfuscatedName("bg") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2194; + public static final ServerPacket field2139; @ObfuscatedName("bw") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2165; - @ObfuscatedName("be") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2147; - @ObfuscatedName("bt") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2197; - @ObfuscatedName("bl") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2202; - @ObfuscatedName("bp") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2172; - @ObfuscatedName("bv") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2200; - @ObfuscatedName("bs") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2201; - @ObfuscatedName("bz") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2189; - @ObfuscatedName("bc") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2203; - @ObfuscatedName("bh") - @ObfuscatedSignature( - signature = "Lgm;" - ) - public static final ServerPacket field2205; + public static final ServerPacket field2123; @ObfuscatedName("bk") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2186; - @ObfuscatedName("cm") + public static final ServerPacket field2141; + @ObfuscatedName("bl") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2206; - @ObfuscatedName("cd") + public static final ServerPacket field2137; + @ObfuscatedName("bq") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2207; - @ObfuscatedName("cv") + public static final ServerPacket field2143; + @ObfuscatedName("bx") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2208; - @ObfuscatedName("cl") + public static final ServerPacket field2102; + @ObfuscatedName("bc") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2209; - @ObfuscatedName("cg") + public static final ServerPacket field2145; + @ObfuscatedName("by") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2210; - @ObfuscatedName("ch") + public static final ServerPacket field2146; + @ObfuscatedName("bz") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2211; + public static final ServerPacket field2147; + @ObfuscatedName("bm") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2148; + @ObfuscatedName("bo") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2169; + @ObfuscatedName("bs") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2170; + @ObfuscatedName("ba") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2151; + @ObfuscatedName("bn") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2152; + @ObfuscatedName("bb") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2133; + @ObfuscatedName("bh") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2154; + @ObfuscatedName("bv") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2155; + @ObfuscatedName("bu") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2156; + @ObfuscatedName("be") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2157; + @ObfuscatedName("bd") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2158; + @ObfuscatedName("bf") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2150; + @ObfuscatedName("bi") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2160; + @ObfuscatedName("br") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2099; + @ObfuscatedName("bt") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2086; + @ObfuscatedName("bp") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2117; @ObfuscatedName("co") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2213; - @ObfuscatedName("cr") + public static final ServerPacket field2115; + @ObfuscatedName("cp") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lfw;" ) - public static final ServerPacket field2195; - @ObfuscatedName("ck") + public static final ServerPacket field2165; + @ObfuscatedName("cd") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2166; + @ObfuscatedName("cj") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2167; + @ObfuscatedName("cq") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2168; + @ObfuscatedName("cb") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2092; + @ObfuscatedName("cf") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2107; + @ObfuscatedName("cs") + @ObfuscatedSignature( + signature = "Lfw;" + ) + public static final ServerPacket field2171; + @ObfuscatedName("ch") @ObfuscatedGetter( - intValue = -1299957985 + intValue = 843552149 ) @Export("id") public final int id; - @ObfuscatedName("cb") + @ObfuscatedName("ca") @ObfuscatedGetter( - intValue = -2018536081 + intValue = 1893776563 ) @Export("length") public final int length; static { - field2132 = new ServerPacket(0, 1); - field2185 = new ServerPacket(1, 6); - field2193 = new ServerPacket(2, -2); - field2134 = new ServerPacket(3, 1); - field2129 = new ServerPacket(4, 6); - field2156 = new ServerPacket(5, -2); - field2173 = new ServerPacket(6, -2); - field2135 = new ServerPacket(7, 5); - field2138 = new ServerPacket(8, -2); - field2137 = new ServerPacket(9, 8); - field2155 = new ServerPacket(10, -2); - field2163 = new ServerPacket(11, 8); - field2133 = new ServerPacket(12, -1); - field2151 = new ServerPacket(13, 1); - field2142 = new ServerPacket(14, 2); - field2143 = new ServerPacket(15, -1); - field2130 = new ServerPacket(16, -2); - field2145 = new ServerPacket(17, 2); - field2146 = new ServerPacket(18, -2); - field2199 = new ServerPacket(19, 0); - field2148 = new ServerPacket(20, -2); - field2149 = new ServerPacket(21, 0); - field2150 = new ServerPacket(22, 3); - field2141 = new ServerPacket(23, 6); - field2144 = new ServerPacket(24, 6); - field2153 = new ServerPacket(25, -2); - field2154 = new ServerPacket(26, 2); - field2198 = new ServerPacket(27, -2); - field2140 = new ServerPacket(28, -2); - field2157 = new ServerPacket(29, 3); - field2158 = new ServerPacket(30, 10); - field2159 = new ServerPacket(31, 20); - field2160 = new ServerPacket(32, -2); - field2161 = new ServerPacket(33, 5); - field2162 = new ServerPacket(34, 4); - field2184 = new ServerPacket(35, 1); - field2164 = new ServerPacket(36, 28); - field2192 = new ServerPacket(37, 5); - field2166 = new ServerPacket(38, 4); - field2167 = new ServerPacket(39, 2); - field2168 = new ServerPacket(40, 7); - field2212 = new ServerPacket(41, 4); - field2170 = new ServerPacket(42, -1); - field2171 = new ServerPacket(43, 2); - field2169 = new ServerPacket(44, 1); - field2136 = new ServerPacket(45, 12); - field2174 = new ServerPacket(46, 2); - field2175 = new ServerPacket(47, 0); - field2176 = new ServerPacket(48, 6); - field2177 = new ServerPacket(49, -2); - field2178 = new ServerPacket(50, 15); - field2179 = new ServerPacket(51, 2); - field2180 = new ServerPacket(52, -2); - field2181 = new ServerPacket(53, 14); - field2182 = new ServerPacket(54, -2); - field2183 = new ServerPacket(55, 2); - field2204 = new ServerPacket(56, 2); - field2152 = new ServerPacket(57, 5); - field2196 = new ServerPacket(58, -1); - field2187 = new ServerPacket(59, -2); - field2188 = new ServerPacket(60, -1); - field2128 = new ServerPacket(61, 6); - field2190 = new ServerPacket(62, 6); - field2191 = new ServerPacket(63, 6); - field2131 = new ServerPacket(64, 6); - field2139 = new ServerPacket(65, 8); - field2194 = new ServerPacket(66, 6); - field2165 = new ServerPacket(67, 2); - field2147 = new ServerPacket(68, -1); - field2197 = new ServerPacket(69, 4); - field2202 = new ServerPacket(70, 4); - field2172 = new ServerPacket(71, 8); - field2200 = new ServerPacket(72, 0); - field2201 = new ServerPacket(73, 6); - field2189 = new ServerPacket(74, 0); - field2203 = new ServerPacket(75, -2); - field2205 = new ServerPacket(76, 0); - field2186 = new ServerPacket(77, -2); - field2206 = new ServerPacket(78, -2); - field2207 = new ServerPacket(79, 0); - field2208 = new ServerPacket(80, 4); - field2209 = new ServerPacket(81, 5); - field2210 = new ServerPacket(82, 4); - field2211 = new ServerPacket(83, 7); - field2213 = new ServerPacket(84, 1); - field2195 = new ServerPacket(85, 10); + field2120 = new ServerPacket(0, -2); + field2087 = new ServerPacket(1, -2); + field2088 = new ServerPacket(2, 1); + field2144 = new ServerPacket(3, 1); + field2090 = new ServerPacket(4, 2); + field2091 = new ServerPacket(5, 4); + field2142 = new ServerPacket(6, 5); + field2140 = new ServerPacket(7, 0); + field2094 = new ServerPacket(8, 2); + field2095 = new ServerPacket(9, 15); + field2096 = new ServerPacket(10, -2); + field2097 = new ServerPacket(11, 2); + field2098 = new ServerPacket(12, 2); + field2163 = new ServerPacket(13, 6); + field2159 = new ServerPacket(14, -2); + field2101 = new ServerPacket(15, 4); + field2149 = new ServerPacket(16, -2); + field2173 = new ServerPacket(17, 1); + field2104 = new ServerPacket(18, 8); + field2105 = new ServerPacket(19, -2); + field2106 = new ServerPacket(20, -2); + field2138 = new ServerPacket(21, 0); + field2108 = new ServerPacket(22, 3); + field2109 = new ServerPacket(23, 5); + field2110 = new ServerPacket(24, 0); + field2162 = new ServerPacket(25, -2); + field2112 = new ServerPacket(26, 4); + field2113 = new ServerPacket(27, 1); + field2114 = new ServerPacket(28, 0); + field2089 = new ServerPacket(29, 6); + field2116 = new ServerPacket(30, -2); + field2100 = new ServerPacket(31, 6); + field2118 = new ServerPacket(32, 0); + field2119 = new ServerPacket(33, 10); + field2093 = new ServerPacket(34, 20); + field2121 = new ServerPacket(35, 6); + field2122 = new ServerPacket(36, 6); + field2129 = new ServerPacket(37, -1); + field2124 = new ServerPacket(38, 8); + field2125 = new ServerPacket(39, 4); + field2126 = new ServerPacket(40, 7); + field2127 = new ServerPacket(41, 1); + field2128 = new ServerPacket(42, 8); + field2164 = new ServerPacket(43, 14); + field2130 = new ServerPacket(44, 10); + field2153 = new ServerPacket(45, -2); + field2132 = new ServerPacket(46, 2); + field2111 = new ServerPacket(47, -2); + field2134 = new ServerPacket(48, 5); + field2135 = new ServerPacket(49, 3); + field2136 = new ServerPacket(50, -2); + field2161 = new ServerPacket(51, -2); + field2131 = new ServerPacket(52, -1); + field2139 = new ServerPacket(53, -2); + field2123 = new ServerPacket(54, 7); + field2141 = new ServerPacket(55, 4); + field2137 = new ServerPacket(56, 2); + field2143 = new ServerPacket(57, 4); + field2102 = new ServerPacket(58, 6); + field2145 = new ServerPacket(59, -2); + field2146 = new ServerPacket(60, 2); + field2147 = new ServerPacket(61, 0); + field2148 = new ServerPacket(62, 5); + field2169 = new ServerPacket(63, -1); + field2170 = new ServerPacket(64, 12); + field2151 = new ServerPacket(65, 28); + field2152 = new ServerPacket(66, 6); + field2133 = new ServerPacket(67, 8); + field2154 = new ServerPacket(68, 6); + field2155 = new ServerPacket(69, -2); + field2156 = new ServerPacket(70, 5); + field2157 = new ServerPacket(71, 4); + field2158 = new ServerPacket(72, 0); + field2150 = new ServerPacket(73, -2); + field2160 = new ServerPacket(74, 6); + field2099 = new ServerPacket(75, -1); + field2086 = new ServerPacket(76, 6); + field2117 = new ServerPacket(77, 6); + field2115 = new ServerPacket(78, 2); + field2165 = new ServerPacket(79, -2); + field2166 = new ServerPacket(80, 1); + field2167 = new ServerPacket(81, -1); + field2168 = new ServerPacket(82, -2); + field2092 = new ServerPacket(83, -1); + field2107 = new ServerPacket(84, 2); + field2171 = new ServerPacket(85, 2); } ServerPacket(int var1, int var2) { @@ -545,105 +545,95 @@ public class ServerPacket { this.length = var2; } - @ObfuscatedName("g") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(ILci;ZI)I", - garbageValue = "2083616637" + signature = "(ILcu;ZI)I", + garbageValue = "-939668271" ) - static int method3657(int var0, Script var1, boolean var2) { - int var3; - int var4; - if (var0 == ScriptOpcodes.CC_CREATE) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - int var5 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 2]; - if (var4 == 0) { - throw new RuntimeException(); - } else { - Widget var6 = Language.getWidget(var3); - if (var6.children == null) { - var6.children = new Widget[var5 + 1]; - } + static int method3568(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? UserComparator7.field1946 : class197.field2398; + if (var0 == ScriptOpcodes.CC_GETSCROLLX) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.scrollX; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.scrollY; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETTEXT) { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3.text; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.scrollWidth; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.scrollHeight; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.modelZoom; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.modelAngleX; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.modelAngleZ; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.modelAngleY; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETTRANSTOP) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.transparencyTop; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETTRANSBOT) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.transparencyBot; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.color; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.color2; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETFILLMODE) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; + return 1; + } else { + return 2; + } + } - 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)); + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "(ILcu;ZI)I", + garbageValue = "631365230" + ) + static int method3569(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? UserComparator7.field1946 : class197.field2398; + if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = class14.method157(WorldMapSection0.getWidgetClickMask(var3)); + return 1; + } else if (var0 != ScriptOpcodes.CC_GETOP) { + if (var0 == ScriptOpcodes.CC_GETOPBASE) { + if (var3.dataText == null) { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; } else { - 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.field1090 = var12; - } else { - class188.field2352 = var12; - } - - ScriptEvent.invalidateWidget(var6); - return 1; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3.dataText; } + + return 1; + } else { + return 2; } } else { - Widget var9; - if (var0 == ScriptOpcodes.CC_DELETE) { - var9 = var2 ? Interpreter.field1090 : class188.field2352; - Widget var10 = Language.getWidget(var9.id); - var10.children[var9.childIndex] = null; - ScriptEvent.invalidateWidget(var10); - return 1; - } else if (var0 == ScriptOpcodes.CC_DELETEALL) { - var9 = Language.getWidget(Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]); - var9.children = null; - ScriptEvent.invalidateWidget(var9); - return 1; - } else if (var0 != ScriptOpcodes.CC_FIND) { - if (var0 == ScriptOpcodes.IF_FIND) { - var9 = Language.getWidget(Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]); - if (var9 != null) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 1; - if (var2) { - Interpreter.field1090 = var9; - } else { - class188.field2352 = var9; - } - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else { - return 2; - } + int var4 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + --var4; + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3.actions[var4]; } else { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - Widget var11 = UserComparator3.getWidgetChild(var3, var4); - if (var11 != null && var4 != -1) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 1; - if (var2) { - Interpreter.field1090 = var11; - } else { - class188.field2352 = var11; - } - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - } - - return 1; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; } + + return 1; } } } diff --git a/runescape-client/src/main/java/Skeleton.java b/runescape-client/src/main/java/Skeleton.java index d050ad3d26..a7f73e3032 100644 --- a/runescape-client/src/main/java/Skeleton.java +++ b/runescape-client/src/main/java/Skeleton.java @@ -3,29 +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("ec") +@ObfuscatedName("ek") @Implements("Skeleton") public class Skeleton extends Node { - @ObfuscatedName("w") - static int[] field1788; - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1887621735 + intValue = 802738175 ) @Export("id") int id; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1674197883 + intValue = -1993583785 ) @Export("count") int count; - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("transformTypes") int[] transformTypes; - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("labels") int[][] labels; @@ -53,51 +50,23 @@ public class Skeleton extends Node { } - @ObfuscatedName("g") + @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "([BI)V", - garbageValue = "870610960" + signature = "(I)V", + garbageValue = "1307556055" ) - @Export("ByteArrayPool_release") - public static synchronized void ByteArrayPool_release(byte[] var0) { - if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < 1000) { - ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; - } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < 250) { - ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; - } else if (var0.length == 30000 && ByteArrayPool.ByteArrayPool_largeCount < 50) { - ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; - } else { - if (ByteArrayPool.ByteArrayPool_arrays != null) { - for (int var1 = 0; var1 < WorldMapSprite.ByteArrayPool_alternativeSizes.length; ++var1) { - if (var0.length == WorldMapSprite.ByteArrayPool_alternativeSizes[var1] && class216.ByteArrayPool_altSizeArrayCounts[var1] < ByteArrayPool.ByteArrayPool_arrays[var1].length) { - ByteArrayPool.ByteArrayPool_arrays[var1][class216.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; - return; - } - } - } + protected static final void method3088() { + Varps.clock.mark(); + int var0; + for (var0 = 0; var0 < 32; ++var0) { + GameShell.graphicsTickTimes[var0] = 0L; } - } - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "(ILci;ZI)I", - garbageValue = "-1324781775" - ) - static int method3107(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.SOUND_SYNTH) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 3; - FileSystem.queueSoundEffect(Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize], Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 2]); - return 1; - } else if (var0 == ScriptOpcodes.SOUND_SONG) { - AttackOption.playSong(Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]); - return 1; - } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - MouseHandler.playSoundJingle(Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize], Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]); - return 1; - } else { - return 2; + for (var0 = 0; var0 < 32; ++var0) { + GameShell.clientTickTimes[var0] = 0L; } + + GameShell.gameCyclesToDo = 0; } } diff --git a/runescape-client/src/main/java/Skills.java b/runescape-client/src/main/java/Skills.java index 93d32013d6..0348c2e3de 100644 --- a/runescape-client/src/main/java/Skills.java +++ b/runescape-client/src/main/java/Skills.java @@ -3,27 +3,15 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hk") +@ObfuscatedName("hv") @Implements("Skills") public class Skills { - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("Skills_enabled") public static final boolean[] Skills_enabled; - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("Skills_experienceTable") public static int[] Skills_experienceTable; - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "[Lbp;" - ) - @Export("World_worlds") - static World[] World_worlds; - @ObfuscatedName("ba") - @ObfuscatedSignature( - signature = "Llm;" - ) - @Export("worldSelectLeftSprite") - static IndexedSprite worldSelectLeftSprite; 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}; @@ -39,74 +27,89 @@ public class Skills { } - @ObfuscatedName("u") + @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "(CB)B", - garbageValue = "11" + signature = "([BI)[B", + garbageValue = "1842420439" ) - @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; + @Export("decompressBytes") + static final byte[] decompressBytes(byte[] var0) { + Buffer var1 = new Buffer(var0); + int var2 = var1.readUnsignedByte(); + int var3 = var1.readInt(); + if (var3 < 0 || AbstractArchive.field3118 != 0 && var3 > AbstractArchive.field3118) { + throw new RuntimeException(); + } else if (var2 == 0) { + byte[] var4 = new byte[var3]; + var1.readBytes(var4, 0, var3); + return var4; } else { - var1 = 63; - } + int var6 = var1.readInt(); + if (var6 >= 0 && (AbstractArchive.field3118 == 0 || var6 <= AbstractArchive.field3118)) { + byte[] var5 = new byte[var6]; + if (var2 == 1) { + BZip2Decompressor.BZip2Decompressor_decompress(var5, var6, var0, var3, 9); + } else { + AbstractArchive.gzipDecompressor.decompress(var1, var5); + } - return var1; + return var5; + } else { + throw new RuntimeException(); + } + } + } + + @ObfuscatedName("hp") + @ObfuscatedSignature( + signature = "(III)V", + garbageValue = "381562265" + ) + @Export("updateItemPile") + static final void updateItemPile(int var0, int var1) { + NodeDeque var2 = Client.groundItems[UrlRequest.Client_plane][var0][var1]; + if (var2 == null) { + class14.scene.removeGroundItemPile(UrlRequest.Client_plane, var0, var1); + } else { + long var3 = -99999999L; + TileItem var5 = null; + + TileItem var6; + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { + ItemDefinition var7 = PacketBufferNode.ItemDefinition_get(var6.id); + long var8 = (long)var7.price; + if (var7.isStackable == 1) { + var8 *= (long)(var6.quantity + 1); + } + + if (var8 > var3) { + var3 = var8; + var5 = var6; + } + } + + if (var5 == null) { + class14.scene.removeGroundItemPile(UrlRequest.Client_plane, var0, var1); + } else { + var2.addLast(var5); + TileItem var12 = null; + TileItem var11 = null; + + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { + if (var5.id != var6.id) { + if (var12 == null) { + var12 = var6; + } + + if (var12.id != var6.id && var11 == null) { + var11 = var6; + } + } + } + + long var9 = KeyHandler.calculateTag(var0, var1, 3, false, 0); + class14.scene.newGroundItemPile(UrlRequest.Client_plane, var0, var1, ScriptEvent.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, UrlRequest.Client_plane), var5, var9, var12, var11); + } + } } } diff --git a/runescape-client/src/main/java/SoftWrapper.java b/runescape-client/src/main/java/SoftWrapper.java index 37f88e2140..c01cc3526a 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("ei") +@ObfuscatedName("fk") @Implements("SoftWrapper") public class SoftWrapper extends Wrapper { - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("ref") SoftReference ref; @@ -15,13 +15,13 @@ public class SoftWrapper extends Wrapper { this.ref = new SoftReference(var1); } - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("get") Object get() { return this.ref.get(); } - @ObfuscatedName("f") + @ObfuscatedName("i") @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 1b1cfa76f2..3914bdbb15 100644 --- a/runescape-client/src/main/java/SoundCache.java +++ b/runescape-client/src/main/java/SoundCache.java @@ -1,42 +1,33 @@ 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("dk") +@ObfuscatedName("dx") @Implements("SoundCache") public class SoundCache { - @ObfuscatedName("sr") + @ObfuscatedName("b") + @Export("PcmPlayer_stereo") + public static boolean PcmPlayer_stereo; + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lh;" - ) - @Export("grandExchangeEvents") - static GrandExchangeEvents grandExchangeEvents; - @ObfuscatedName("fd") - @ObfuscatedGetter( - intValue = -1460777927 - ) - static int field1438; - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lhf;" + signature = "Lhz;" ) @Export("soundEffectIndex") AbstractArchive soundEffectIndex; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lhf;" + signature = "Lhz;" ) @Export("musicSampleIndex") AbstractArchive musicSampleIndex; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "Lle;" ) @Export("musicSamples") NodeHashTable musicSamples; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "Lle;" ) @@ -44,7 +35,7 @@ public class SoundCache { NodeHashTable rawSounds; @ObfuscatedSignature( - signature = "(Lhf;Lhf;)V" + signature = "(Lhz;Lhz;)V" ) public SoundCache(AbstractArchive var1, AbstractArchive var2) { this.musicSamples = new NodeHashTable(256); @@ -53,10 +44,10 @@ public class SoundCache { this.musicSampleIndex = var2; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(II[II)Lcw;", - garbageValue = "1674765898" + signature = "(II[II)Lcc;", + garbageValue = "61086280" ) @Export("getSoundEffect0") RawSound getSoundEffect0(int var1, int var2, int[] var3) { @@ -84,10 +75,10 @@ public class SoundCache { } } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(II[IB)Lcw;", - garbageValue = "-43" + signature = "(II[II)Lcc;", + garbageValue = "-1521507818" ) @Export("getMusicSample0") RawSound getMusicSample0(int var1, int var2, int[] var3) { @@ -121,10 +112,10 @@ public class SoundCache { } } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(I[II)Lcw;", - garbageValue = "1055604971" + signature = "(I[IB)Lcc;", + garbageValue = "0" ) @Export("getSoundEffect") public RawSound getSoundEffect(int var1, int[] var2) { @@ -137,10 +128,10 @@ public class SoundCache { } } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(I[IB)Lcw;", - garbageValue = "93" + signature = "(I[IB)Lcc;", + garbageValue = "1" ) @Export("getMusicSample") public RawSound getMusicSample(int var1, int[] var2) { @@ -153,31 +144,78 @@ public class SoundCache { } } - @ObfuscatedName("u") + @ObfuscatedName("fz") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "851722270" + signature = "(B)V", + garbageValue = "102" ) - public static boolean method2544(int var0) { - return (var0 & 1) != 0; - } + static final void method2509() { + if (UrlRequest.Client_plane != Client.field853) { + Client.field853 = UrlRequest.Client_plane; + int var0 = UrlRequest.Client_plane; + int[] var1 = Language.sceneMinimapSprite.pixels; + int var2 = var1.length; - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "(II)J", - garbageValue = "-1448942759" - ) - public static long method2531(int var0) { - return ViewportMouse.ViewportMouse_entityTags[var0]; - } + int var3; + for (var3 = 0; var3 < var2; ++var3) { + var1[var3] = 0; + } + + int var4; + int var5; + for (var3 = 1; var3 < 103; ++var3) { + var4 = (103 - var3) * 2048 + 24628; + + for (var5 = 1; var5 < 103; ++var5) { + if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) { + class14.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3); + } + + if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { + class14.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3); + } + + var4 += 4; + } + } + + var3 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); + var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; + Language.sceneMinimapSprite.setRaster(); + + int var6; + for (var5 = 1; var5 < 103; ++var5) { + for (var6 = 1; var6 < 103; ++var6) { + if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) { + HorizontalAlignment.drawObject(var0, var6, var5, var3, var4); + } + + if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { + HorizontalAlignment.drawObject(var0 + 1, var6, var5, var3, var4); + } + } + } + + Client.mapIconCount = 0; + + for (var5 = 0; var5 < 104; ++var5) { + for (var6 = 0; var6 < 104; ++var6) { + long var7 = class14.scene.getFloorDecorationTag(UrlRequest.Client_plane, var5, var6); + if (var7 != 0L) { + int var9 = class2.Entity_unpackID(var7); + int var10 = Coord.getObjectDefinition(var9).mapIconId; + if (var10 >= 0) { + Client.mapIcons[Client.mapIconCount] = GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(var10).getSpriteBool(false); + Client.mapIconXs[Client.mapIconCount] = var5; + Client.mapIconYs[Client.mapIconCount] = var6; + ++Client.mapIconCount; + } + } + } + } + + IgnoreList.rasterProvider.apply(); + } - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;I)I", - garbageValue = "-1986305068" - ) - @Export("parseInt") - public static int parseInt(CharSequence var0) { - return UserComparator8.parseIntCustomRadix(var0, 10, true); } } diff --git a/runescape-client/src/main/java/SoundEffect.java b/runescape-client/src/main/java/SoundEffect.java index ad92f89929..f147c1ed90 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("cz") +@ObfuscatedName("cl") @Implements("SoundEffect") public class SoundEffect { - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "[Ldr;" + signature = "[Ldp;" ) @Export("instruments") Instrument[] instruments; - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("start") int start; - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("end") int end; @ObfuscatedSignature( - signature = "(Lkg;)V" + signature = "(Lkq;)V" ) SoundEffect(Buffer var1) { this.instruments = new Instrument[10]; @@ -38,9 +38,9 @@ public class SoundEffect { this.end = var1.readUnsignedShort(); } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "()Lcw;" + signature = "()Lcc;" ) @Export("toRawSound") public RawSound toRawSound() { @@ -48,7 +48,7 @@ public class SoundEffect { return new RawSound(22050, var1, this.start * 22050 / 1000, this.end * 22050 / 1000); } - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("calculateDelay") public final int calculateDelay() { int var1 = 9999999; @@ -83,7 +83,7 @@ public class SoundEffect { } } - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("mix") final byte[] mix() { int var1 = 0; @@ -122,9 +122,9 @@ public class SoundEffect { } } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Lhf;II)Lcz;" + signature = "(Lhz;II)Lcl;" ) @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 af6d01807c..e8595410ae 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("dx") +@ObfuscatedName("do") @Implements("SoundEnvelope") public class SoundEnvelope { - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("segments") int segments; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("durations") int[] durations; - @ObfuscatedName("b") - @Export("phases") - int[] phases; - @ObfuscatedName("g") - @Export("start") - int start; - @ObfuscatedName("z") - @Export("end") - int end; - @ObfuscatedName("p") - @Export("form") - int form; - @ObfuscatedName("h") - @Export("ticks") - int ticks; @ObfuscatedName("y") @Export("max") int max; @ObfuscatedName("w") + @Export("phases") + int[] phases; + @ObfuscatedName("p") + @Export("start") + int start; + @ObfuscatedName("b") + @Export("end") + int end; + @ObfuscatedName("e") + @Export("form") + int form; + @ObfuscatedName("a") + @Export("ticks") + int ticks; + @ObfuscatedName("d") @Export("phaseIndex") int phaseIndex; - @ObfuscatedName("i") + @ObfuscatedName("c") @Export("step") int step; - @ObfuscatedName("k") + @ObfuscatedName("o") @Export("amplitude") int amplitude; @@ -50,9 +50,9 @@ public class SoundEnvelope { this.phases[1] = 65535; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Lkg;)V" + signature = "(Lkq;)V" ) @Export("decode") final void decode(Buffer var1) { @@ -62,9 +62,9 @@ public class SoundEnvelope { this.decodeSegments(var1); } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkg;)V" + signature = "(Lkq;)V" ) @Export("decodeSegments") final void decodeSegments(Buffer var1) { @@ -79,7 +79,7 @@ public class SoundEnvelope { } - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("reset") final void reset() { this.ticks = 0; @@ -89,7 +89,7 @@ public class SoundEnvelope { this.max = 0; } - @ObfuscatedName("g") + @ObfuscatedName("w") @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 e8c66d80ba..a242f01c5e 100644 --- a/runescape-client/src/main/java/SoundSystem.java +++ b/runescape-client/src/main/java/SoundSystem.java @@ -1,22 +1,23 @@ 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("dc") +@ObfuscatedName("dk") @Implements("SoundSystem") public class SoundSystem implements Runnable { - @ObfuscatedName("ku") - @ObfuscatedGetter( - intValue = -73888697 - ) - @Export("menuHeight") - static int menuHeight; - @ObfuscatedName("u") + @ObfuscatedName("r") + @Export("BZip2Decompressor_block") + static int[] BZip2Decompressor_block; + @ObfuscatedName("dq") @ObfuscatedSignature( - signature = "[Lde;" + signature = "Lif;" + ) + @Export("archive12") + static Archive archive12; + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "[Lcw;" ) @Export("players") volatile PcmPlayer[] players; @@ -34,167 +35,52 @@ public class SoundSystem implements Runnable { } } } catch (Exception var4) { - Calendar.RunException_sendStackTrace((String)null, var4); + DesktopPlatformInfoProvider.RunException_sendStackTrace((String)null, var4); } } - @ObfuscatedName("u") + @ObfuscatedName("kf") @ObfuscatedSignature( - signature = "(Lhf;Lhf;ZLky;I)V", - garbageValue = "-1163192511" + signature = "(Lha;B)V", + garbageValue = "9" ) - public static void method2529(AbstractArchive var0, AbstractArchive var1, boolean var2, Font var3) { - ItemDefinition.ItemDefinition_archive = var0; - class266.ItemDefinition_modelArchive = var1; - ItemDefinition.ItemDefinition_inMembersWorld = var2; - class81.ItemDefinition_fileCount = ItemDefinition.ItemDefinition_archive.getGroupFileCount(10); - class335.ItemDefinition_fontPlain11 = var3; - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - signature = "(ILci;ZI)I", - garbageValue = "-107397374" - ) - static int method2530(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; - return 1; - } else { - int var12; - if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var12 == 0 ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var12 == 2 ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var12 == 5 ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var12 == 1 ? 1 : 0; - return 1; - } else { - boolean var13; - if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { - var13 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - if (SoundCache.grandExchangeEvents != null) { - SoundCache.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var13); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { - var13 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - if (SoundCache.grandExchangeEvents != null) { - SoundCache.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var13); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var13 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - boolean var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1] == 1; - if (SoundCache.grandExchangeEvents != null) { - Client.GrandExchangeEvents_worldComparator.filterWorlds = var4; - SoundCache.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var13); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { - var13 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - if (SoundCache.grandExchangeEvents != null) { - SoundCache.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var13); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { - var13 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - if (SoundCache.grandExchangeEvents != null) { - SoundCache.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var13); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = SoundCache.grandExchangeEvents == null ? 0 : SoundCache.grandExchangeEvents.events.size(); - return 1; - } else { - GrandExchangeEvent var11; - if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)SoundCache.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var11.world; - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)SoundCache.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var11.getOfferName(); - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)SoundCache.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var11.getPreviousOfferName(); - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)SoundCache.grandExchangeEvents.events.get(var3); - long var5 = TaskHandler.currentTimeMillis() - class65.field604 - 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[++class43.Interpreter_stringStackSize - 1] = var10; - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)SoundCache.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.totalQuantity; - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)SoundCache.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.unitPrice; - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)SoundCache.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.id; - return 1; - } else { - return 2; - } - } + static final void method2507(Widget var0) { + int var1 = var0.contentType; + if (var1 == 324) { + if (Client.field893 == -1) { + Client.field893 = var0.spriteId2; + Client.field894 = var0.spriteId; } + + if (Client.playerAppearance.isFemale) { + var0.spriteId2 = Client.field893; + } else { + var0.spriteId2 = Client.field894; + } + + } else if (var1 == 325) { + if (Client.field893 == -1) { + Client.field893 = var0.spriteId2; + Client.field894 = var0.spriteId; + } + + if (Client.playerAppearance.isFemale) { + var0.spriteId2 = Client.field894; + } else { + var0.spriteId2 = Client.field893; + } + + } else if (var1 == 327) { + var0.modelAngleX = 150; + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; + var0.modelType = 5; + var0.modelId = 0; + } else if (var1 == 328) { + var0.modelAngleX = 150; + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; + var0.modelType = 5; + var0.modelId = 1; } } } diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java index bf0cac97cd..50bd26b18d 100644 --- a/runescape-client/src/main/java/SpotAnimationDefinition.java +++ b/runescape-client/src/main/java/SpotAnimationDefinition.java @@ -4,90 +4,96 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ir") +@ObfuscatedName("il") @Implements("SpotAnimationDefinition") public class SpotAnimationDefinition extends DualNode { - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lhf;" - ) - @Export("SpotAnimationDefinition_archive") - public static AbstractArchive SpotAnimationDefinition_archive; @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lhf;" + signature = "Lhz;" + ) + @Export("SpotAnimationDefinition_archive") + static AbstractArchive SpotAnimationDefinition_archive; + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "Lhz;" ) @Export("SpotAnimationDefinition_modelArchive") - public static AbstractArchive SpotAnimationDefinition_modelArchive; - @ObfuscatedName("b") + static AbstractArchive SpotAnimationDefinition_modelArchive; + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lef;" + signature = "Leb;" ) @Export("SpotAnimationDefinition_cached") - public static EvictingDualNodeHashTable SpotAnimationDefinition_cached; - @ObfuscatedName("g") + static EvictingDualNodeHashTable SpotAnimationDefinition_cached; + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lef;" + signature = "Leb;" ) @Export("SpotAnimationDefinition_cachedModels") - public static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; - @ObfuscatedName("z") + static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; + @ObfuscatedName("bm") + @ObfuscatedSignature( + signature = "[Lli;" + ) + @Export("worldSelectStars") + static IndexedSprite[] worldSelectStars; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1268468577 + intValue = -759874899 ) @Export("id") int id; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -52885791 + intValue = 1353140191 ) @Export("archive") int archive; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 142429503 + intValue = -2008719419 ) @Export("sequence") public int sequence; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("w") + @ObfuscatedName("a") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("k") + @ObfuscatedName("c") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -102258765 + intValue = -1607590033 ) @Export("widthScale") int widthScale; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1241628367 + intValue = -1512970325 ) @Export("heightScale") int heightScale; - @ObfuscatedName("e") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1943149367 + intValue = -1290166203 ) @Export("orientation") int orientation; - @ObfuscatedName("n") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 587546705 + intValue = 1081769017 ) @Export("ambient") int ambient; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1349692519 + intValue = 1724072869 ) @Export("contrast") int contrast; @@ -106,10 +112,10 @@ public class SpotAnimationDefinition extends DualNode { this.contrast = 0; } - @ObfuscatedName("f") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Lkg;I)V", - garbageValue = "1557437802" + signature = "(Lkq;I)V", + garbageValue = "-580385210" ) @Export("decode") void decode(Buffer var1) { @@ -123,10 +129,10 @@ public class SpotAnimationDefinition extends DualNode { } } - @ObfuscatedName("b") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lkg;II)V", - garbageValue = "-1153531300" + signature = "(Lkq;IB)V", + garbageValue = "1" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -170,10 +176,10 @@ public class SpotAnimationDefinition extends DualNode { } - @ObfuscatedName("g") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(IB)Ldf;", - garbageValue = "67" + signature = "(II)Ldw;", + garbageValue = "-858962749" ) @Export("getModel") public final Model getModel(int var1) { @@ -203,7 +209,7 @@ public class SpotAnimationDefinition extends DualNode { Model var5; if (this.sequence != -1 && var1 != -1) { - var5 = GrandExchangeOfferAgeComparator.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); + var5 = WorldMapSection0.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); } else { var5 = var2.toSharedSpotAnimationModel(true); } @@ -231,23 +237,4 @@ public class SpotAnimationDefinition extends DualNode { return var5; } - - @ObfuscatedName("eq") - @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "150195420" - ) - static int method4509() { - if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { - int var0 = 0; - - for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { - var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; - } - - return var0 * 10000 / Client.field914; - } else { - return 10000; - } - } } diff --git a/runescape-client/src/main/java/Sprite.java b/runescape-client/src/main/java/Sprite.java index bec45a26ef..77d35ef6a5 100644 --- a/runescape-client/src/main/java/Sprite.java +++ b/runescape-client/src/main/java/Sprite.java @@ -3,28 +3,28 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ln") +@ObfuscatedName("ls") @Implements("Sprite") public final class Sprite extends Rasterizer2D { - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("pixels") public int[] pixels; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("subWidth") public int subWidth; - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("subHeight") public int subHeight; - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("xOffset") public int xOffset; - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("yOffset") int yOffset; - @ObfuscatedName("p") + @ObfuscatedName("b") @Export("width") public int width; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("height") public int height; @@ -43,9 +43,9 @@ public final class Sprite extends Rasterizer2D { Sprite() { } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "()Lln;" + signature = "()Lls;" ) @Export("mirrorHorizontally") public Sprite mirrorHorizontally() { @@ -64,9 +64,9 @@ public final class Sprite extends Rasterizer2D { return var1; } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "()Lln;" + signature = "()Lls;" ) @Export("copyNormalized") public Sprite copyNormalized() { @@ -81,13 +81,13 @@ public final class Sprite extends Rasterizer2D { return var1; } - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("setRaster") public void setRaster() { Rasterizer2D.Rasterizer2D_replace(this.pixels, this.subWidth, this.subHeight); } - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("normalize") public void normalize() { if (this.subWidth != this.width || this.subHeight != this.height) { @@ -107,7 +107,7 @@ public final class Sprite extends Rasterizer2D { } } - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("pad") public void pad(int var1) { if (this.subWidth != this.width || this.subHeight != this.height) { @@ -149,7 +149,7 @@ public final class Sprite extends Rasterizer2D { } } - @ObfuscatedName("p") + @ObfuscatedName("b") @Export("flipHorizontally") public void flipHorizontally() { int[] var1 = new int[this.subWidth * this.subHeight]; @@ -165,7 +165,7 @@ public final class Sprite extends Rasterizer2D { this.xOffset = this.width - this.subWidth - this.xOffset; } - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("flipVertically") public void flipVertically() { int[] var1 = new int[this.subWidth * this.subHeight]; @@ -181,7 +181,7 @@ public final class Sprite extends Rasterizer2D { this.yOffset = this.height - this.subHeight - this.yOffset; } - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("outline") public void outline(int var1) { int[] var2 = new int[this.subWidth * this.subHeight]; @@ -209,7 +209,7 @@ public final class Sprite extends Rasterizer2D { this.pixels = var2; } - @ObfuscatedName("w") + @ObfuscatedName("a") @Export("shadow") public void shadow(int var1) { for (int var2 = this.subHeight - 1; var2 > 0; --var2) { @@ -224,7 +224,7 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("drawAt") public void drawAt(int var1, int var2) { var1 += this.xOffset; @@ -270,7 +270,7 @@ public final class Sprite extends Rasterizer2D { } } - @ObfuscatedName("x") + @ObfuscatedName("o") @Export("drawTransBgAt") public void drawTransBgAt(int var1, int var2) { var1 += this.xOffset; @@ -316,7 +316,7 @@ public final class Sprite extends Rasterizer2D { } } - @ObfuscatedName("e") + @ObfuscatedName("t") @Export("drawScaledAt") public void drawScaledAt(int var1, int var2, int var3, int var4) { if (var3 > 0 && var4 > 0) { @@ -381,7 +381,7 @@ public final class Sprite extends Rasterizer2D { } } - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("drawTransOverlayAt") public void drawTransOverlayAt(int var1, int var2, int var3, int var4) { if (var3 == 256) { @@ -431,7 +431,7 @@ public final class Sprite extends Rasterizer2D { } } - @ObfuscatedName("t") + @ObfuscatedName("z") @Export("drawTransAt") public void drawTransAt(int var1, int var2, int var3) { var1 += this.xOffset; @@ -477,7 +477,7 @@ public final class Sprite extends Rasterizer2D { } } - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("drawTransScaledAt") public void drawTransScaledAt(int var1, int var2, int var3, int var4, int var5) { if (var3 > 0 && var4 > 0) { @@ -542,8 +542,8 @@ public final class Sprite extends Rasterizer2D { } } - @ObfuscatedName("l") - public void method6217(int var1, int var2, int var3) { + @ObfuscatedName("av") + public void method6159(int var1, int var2, int var3) { var1 += this.xOffset; var2 += this.yOffset; int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; @@ -584,16 +584,16 @@ public final class Sprite extends Rasterizer2D { if (var7 > 0 && var6 > 0) { if (var3 == 256) { - method6218(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); + method6146(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); } else { - method6225(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); + method6161(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); } } } - @ObfuscatedName("am") - public void method6220(int var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("ak") + public void method6162(int var1, int var2, int var3, int var4, int var5) { if (var3 > 0 && var4 > 0) { int var6 = this.subWidth; int var7 = this.subHeight; @@ -653,16 +653,16 @@ public final class Sprite extends Rasterizer2D { } if (var5 == 256) { - method6221(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); + method6163(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); } else { - method6222(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); + method6164(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); } } } - @ObfuscatedName("ao") - public void method6223(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) { + @ObfuscatedName("aq") + public void method6251(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) { int var9 = var2 < 0 ? -var2 : 0; int var10 = var2 + this.subHeight <= var6 ? this.subHeight : var6 - var2; int var11 = var1 < 0 ? -var1 : 0; @@ -709,7 +709,7 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("aw") + @ObfuscatedName("ao") @Export("drawRotatedMaskedCenteredAround") public void drawRotatedMaskedCenteredAround(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int[] var9, int[] var10) { try { @@ -744,8 +744,8 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("ak") - public void method6200(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { + @ObfuscatedName("an") + public void method6167(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { try { int var10 = -var3 / 2; int var11 = -var4 / 2; @@ -783,13 +783,13 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("aa") - public void method6226(int var1, int var2, int var3, int var4) { - this.method6227(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); + @ObfuscatedName("ar") + public void method6243(int var1, int var2, int var3, int var4) { + this.method6169(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); } - @ObfuscatedName("ab") - void method6227(int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("az") + void method6169(int var1, int var2, int var3, int var4, int var5, int var6) { if (var6 != 0) { var1 -= this.xOffset << 4; var2 -= this.yOffset << 4; @@ -1257,7 +1257,7 @@ public final class Sprite extends Rasterizer2D { } } - @ObfuscatedName("ar") + @ObfuscatedName("ay") @Export("drawScaledWorldmap") public void drawScaledWorldmap(int var1, int var2, int var3, int var4) { if (var3 <= this.width && var4 <= this.height) { @@ -1380,7 +1380,7 @@ public final class Sprite extends Rasterizer2D { } } - @ObfuscatedName("k") + @ObfuscatedName("c") @Export("Sprite_draw") static void Sprite_draw(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7) { for (int var8 = -var5; var8 < 0; ++var8) { @@ -1400,7 +1400,7 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("o") + @ObfuscatedName("l") @Export("Sprite_drawTransBg") static void Sprite_drawTransBg(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9 = -(var5 >> 2); @@ -1453,7 +1453,7 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("n") + @ObfuscatedName("j") @Export("Sprite_drawScaled") static void Sprite_drawScaled(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { int var12 = var3; @@ -1479,7 +1479,7 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("s") + @ObfuscatedName("u") @Export("Sprite_drawTransOverlay") static void Sprite_drawTransOverlay(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { int var11 = 256 - var9; @@ -1505,7 +1505,7 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("m") + @ObfuscatedName("h") @Export("Sprite_drawTransparent") static void Sprite_drawTransparent(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) { int var10 = 256 - var9; @@ -1527,7 +1527,7 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("q") + @ObfuscatedName("aa") @Export("Sprite_drawTransScaled") static void Sprite_drawTransScaled(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { int var13 = 256 - var12; @@ -1555,8 +1555,8 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("j") - static void method6218(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { + @ObfuscatedName("aw") + static void method6146(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { for (var8 = -var10; var8 < 0; ++var8) { for (var6 = -var9; var6 < 0; ++var6) { var0 = var4[var5++]; @@ -1577,8 +1577,8 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("ad") - static void method6225(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13) { + @ObfuscatedName("as") + static void method6161(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13) { for (var8 = -var10; var8 < 0; ++var8) { for (var6 = -var9; var6 < 0; ++var6) { var0 = var4[var5++]; @@ -1601,8 +1601,8 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("ai") - static void method6221(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) { + @ObfuscatedName("au") + static void method6163(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) { for (int var16 = var3; var8 < 0; ++var8) { var7 = var15 * (var9 >> 16); @@ -1628,8 +1628,8 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("ag") - static void method6222(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("ah") + static void method6164(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16) { for (int var17 = var3; var8 < 0; ++var8) { var7 = var15 * (var9 >> 16); diff --git a/runescape-client/src/main/java/SpriteMask.java b/runescape-client/src/main/java/SpriteMask.java index 76a00564d7..b556c0eb7e 100644 --- a/runescape-client/src/main/java/SpriteMask.java +++ b/runescape-client/src/main/java/SpriteMask.java @@ -1,45 +1,28 @@ -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("hn") +@ObfuscatedName("hy") @Implements("SpriteMask") public class SpriteMask extends DualNode { - @ObfuscatedName("dz") - @ObfuscatedSignature( - signature = "Lij;" - ) - @Export("archive4") - static Archive archive4; - @ObfuscatedName("fs") - @ObfuscatedSignature( - signature = "Lew;" - ) - @Export("urlRequester") - static UrlRequester urlRequester; - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 913794949 + intValue = -78819829 ) @Export("width") public final int width; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -396623099 + intValue = -982399363 ) @Export("height") public final int height; - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("xWidths") public final int[] xWidths; - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("xStarts") public final int[] xStarts; @@ -50,10 +33,10 @@ public class SpriteMask extends DualNode { this.xStarts = var4; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(III)Z", - garbageValue = "-253214096" + signature = "(IIB)Z", + garbageValue = "-24" ) @Export("contains") public boolean contains(int var1, int var2) { @@ -66,159 +49,4 @@ public class SpriteMask extends DualNode { return false; } - - @ObfuscatedName("f") - public static String method4038(long var0) { - if (var0 > 0L && var0 < 6582952005840035281L) { - if (0L == var0 % 37L) { - return null; - } else { - int var2 = 0; - - for (long var3 = var0; var3 != 0L; var3 /= 37L) { - ++var2; - } - - StringBuilder var5 = new StringBuilder(var2); - - while (0L != var0) { - long var6 = var0; - var0 /= 37L; - var5.append(class288.base37Table[(int)(var6 - 37L * var0)]); - } - - return var5.reverse().toString(); - } - } else { - return null; - } - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "87" - ) - public static void method4040() { - if (MouseHandler.MouseHandler_instance != null) { - synchronized(MouseHandler.MouseHandler_instance) { - MouseHandler.MouseHandler_instance = null; - } - } - - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "(Ljava/lang/Throwable;I)Ljava/lang/String;", - garbageValue = "467734351" - ) - static String method4035(Throwable var0) throws IOException { - String var1; - if (var0 instanceof RunException) { - RunException var2 = (RunException)var0; - var1 = var2.message + " | "; - var0 = var2.throwable; - } else { - var1 = ""; - } - - StringWriter var12 = new StringWriter(); - PrintWriter var3 = new PrintWriter(var12); - var0.printStackTrace(var3); - var3.close(); - String var4 = var12.toString(); - BufferedReader var5 = new BufferedReader(new StringReader(var4)); - String var6 = var5.readLine(); - - while (true) { - while (true) { - String var7 = var5.readLine(); - if (var7 == null) { - var1 = var1 + "| " + var6; - return var1; - } - - int var8 = var7.indexOf(40); - int var9 = var7.indexOf(41, var8 + 1); - if (var8 >= 0 && var9 >= 0) { - String var10 = var7.substring(var8 + 1, var9); - int var11 = var10.indexOf(".java:"); - if (var11 >= 0) { - var10 = var10.substring(0, var11) + var10.substring(var11 + 5); - var1 = var1 + var10 + ' '; - continue; - } - - var7 = var7.substring(0, var8); - } - - var7 = var7.trim(); - var7 = var7.substring(var7.lastIndexOf(32) + 1); - var7 = var7.substring(var7.lastIndexOf(9) + 1); - var1 = var1 + var7 + ' '; - } - } - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;IZB)Z", - garbageValue = "25" - ) - static boolean method4039(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 = var5 * var1 + var10; - if (var9 / var1 != var5) { - return false; - } - - var5 = var9; - var4 = true; - } - - return var4; - } else { - throw new IllegalArgumentException("" + var1); - } - } } diff --git a/runescape-client/src/main/java/Strings.java b/runescape-client/src/main/java/Strings.java index 7e780f5c10..49fe359507 100644 --- a/runescape-client/src/main/java/Strings.java +++ b/runescape-client/src/main/java/Strings.java @@ -1,25 +1,129 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hy") +@ObfuscatedName("hm") @Implements("Strings") public class Strings { - @ObfuscatedName("bu") - public static String field2823; - @ObfuscatedName("cs") - public static String field2862; - @ObfuscatedName("jo") - public static String field2912; - @ObfuscatedName("jl") - public static String field3039; - @ObfuscatedName("js") - public static String field2786; + @ObfuscatedName("bk") + public static String field2798; + @ObfuscatedName("ct") + public static String field2837; + @ObfuscatedName("jk") + public static String field2834; + @ObfuscatedName("jx") + public static String field3014; + @ObfuscatedName("jd") + public static String field3015; static { - field2823 = "Please visit the support page for assistance."; - field2862 = "Please visit the support page for assistance."; - field2912 = ""; - field3039 = "Page has opened in a new window."; - field2786 = "(Please check your popup blocker.)"; + field2798 = "Please visit the support page for assistance."; + field2837 = "Please visit the support page for assistance."; + field2834 = ""; + field3014 = "Page has opened in a new window."; + field3015 = "(Please check your popup blocker.)"; + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "([BILjava/lang/CharSequence;B)I", + garbageValue = "-83" + ) + public static int method4095(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 & '?'); + } + } + + return var4 - var1; + } + + @ObfuscatedName("id") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "1938003429" + ) + static void method4096() { + int var0; + int var2; + int var3; + for (var0 = 0; var0 < Client.menuOptionsCount; ++var0) { + var2 = Client.menuOpcodes[var0]; + boolean var1 = var2 == 57 || var2 == 58 || var2 == 1007 || var2 == 25 || var2 == 30; + if (var1) { + if (var0 < Client.menuOptionsCount - 1) { + for (var3 = var0; var3 < Client.menuOptionsCount - 1; ++var3) { + Client.menuActions[var3] = Client.menuActions[var3 + 1]; + Client.menuTargets[var3] = Client.menuTargets[var3 + 1]; + Client.menuOpcodes[var3] = Client.menuOpcodes[var3 + 1]; + Client.menuIdentifiers[var3] = Client.menuIdentifiers[var3 + 1]; + Client.menuArguments1[var3] = Client.menuArguments1[var3 + 1]; + Client.menuArguments2[var3] = Client.menuArguments2[var3 + 1]; + Client.menuShiftClick[var3] = Client.menuShiftClick[var3 + 1]; + } + } + + --var0; + --Client.menuOptionsCount; + } + } + + var0 = KeyHandler.menuWidth / 2 + GrandExchangeEvent.menuX; + int var9 = WorldMapManager.menuY; + var2 = GrandExchangeOffer.fontBold12.stringWidth("Choose Option"); + + for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { + Font var4 = GrandExchangeOffer.fontBold12; + String var5; + if (var3 < 0) { + var5 = ""; + } else if (Client.menuTargets[var3].length() > 0) { + var5 = Client.menuActions[var3] + " " + Client.menuTargets[var3]; + } else { + var5 = Client.menuActions[var3]; + } + + int var6 = var4.stringWidth(var5); + if (var6 > var2) { + var2 = var6; + } + } + + var2 += 8; + var3 = Client.menuOptionsCount * 15 + 22; + int var7 = var0 - var2 / 2; + if (var7 + var2 > GrandExchangeOfferTotalQuantityComparator.canvasWidth) { + var7 = GrandExchangeOfferTotalQuantityComparator.canvasWidth - var2; + } + + if (var7 < 0) { + var7 = 0; + } + + int var8 = var9; + if (var9 + var3 > AttackOption.canvasHeight) { + var8 = AttackOption.canvasHeight - var3; + } + + if (var8 < 0) { + var8 = 0; + } + + GrandExchangeEvent.menuX = var7; + WorldMapManager.menuY = var8; + KeyHandler.menuWidth = var2; + class54.menuHeight = Client.menuOptionsCount * 15 + 22; } } diff --git a/runescape-client/src/main/java/StructDefinition.java b/runescape-client/src/main/java/StructDefinition.java index 0dec27d980..af41f25c9a 100644 --- a/runescape-client/src/main/java/StructDefinition.java +++ b/runescape-client/src/main/java/StructDefinition.java @@ -3,35 +3,30 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("id") +@ObfuscatedName("is") @Implements("StructDefinition") public class StructDefinition extends DualNode { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lhf;" + signature = "Lhz;" ) @Export("StructDefinition_archive") static AbstractArchive StructDefinition_archive; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lef;" + signature = "Leb;" ) @Export("StructDefinition_cached") static EvictingDualNodeHashTable StructDefinition_cached; - @ObfuscatedName("g") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "[Llm;" + signature = "Lbd;" ) - @Export("runesSprite") - static IndexedSprite[] runesSprite; - @ObfuscatedName("e") + @Export("loginScreenRunesAnimation") + static LoginScreenAnimation loginScreenRunesAnimation; + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Llm;" - ) - static IndexedSprite field3315; - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "Llb;" + signature = "Llc;" ) @Export("params") IterableNodeHashTable params; @@ -43,19 +38,19 @@ public class StructDefinition extends DualNode { StructDefinition() { } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "592046740" + garbageValue = "-1694399537" ) @Export("postDecode") void postDecode() { } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lkg;I)V", - garbageValue = "-303940438" + signature = "(Lkq;I)V", + garbageValue = "-1313087587" ) @Export("decode") void decode(Buffer var1) { @@ -69,49 +64,179 @@ public class StructDefinition extends DualNode { } } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Lkg;II)V", - garbageValue = "1709382073" + signature = "(Lkq;IB)V", + garbageValue = "2" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 249) { - this.params = ModelData0.readStringIntParameters(var1, this.params); + this.params = Calendar.readStringIntParameters(var1, this.params); } } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "48" + signature = "(III)I", + garbageValue = "445815336" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - IterableNodeHashTable var4 = this.params; - int var3; - if (var4 == null) { - var3 = var2; - } else { - IntegerNode var5 = (IntegerNode)var4.get((long)var1); - if (var5 == null) { - var3 = var2; - } else { - var3 = var5.integer; - } - } - - return var3; + return class83.method2071(this.params, var1, var2); } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "1804535212" + signature = "(ILjava/lang/String;B)Ljava/lang/String;", + garbageValue = "-8" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return ServerBuild.method4214(this.params, var1, var2); + return class14.method151(this.params, var1, var2); + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", + garbageValue = "1595091169" + ) + public static String method4551(CharSequence var0) { + return UserComparator6.method3370('*', var0.length()); + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "(IIB)Z", + garbageValue = "0" + ) + static final boolean method4546(int var0, int var1) { + ObjectDefinition var2 = Coord.getObjectDefinition(var0); + if (var1 == 11) { + var1 = 10; + } + + if (var1 >= 5 && var1 <= 8) { + var1 = 4; + } + + return var2.method4616(var1); + } + + @ObfuscatedName("gj") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "363580597" + ) + static final void method4529() { + int var0 = SequenceDefinition.field3477 * 128 + 64; + int var1 = AbstractWorldMapData.field147 * 128 + 64; + int var2 = ScriptEvent.getTileHeight(var0, var1, UrlRequest.Client_plane) - Canvas.field397; + if (MusicPatchNode2.cameraX < var0) { + MusicPatchNode2.cameraX = (var0 - MusicPatchNode2.cameraX) * WorldMapData_0.field92 / 1000 + MusicPatchNode2.cameraX + HitSplatDefinition.field3312; + if (MusicPatchNode2.cameraX > var0) { + MusicPatchNode2.cameraX = var0; + } + } + + if (MusicPatchNode2.cameraX > var0) { + MusicPatchNode2.cameraX -= WorldMapData_0.field92 * (MusicPatchNode2.cameraX - var0) / 1000 + HitSplatDefinition.field3312; + if (MusicPatchNode2.cameraX < var0) { + MusicPatchNode2.cameraX = var0; + } + } + + if (class60.cameraY < var2) { + class60.cameraY = (var2 - class60.cameraY) * WorldMapData_0.field92 / 1000 + class60.cameraY + HitSplatDefinition.field3312; + if (class60.cameraY > var2) { + class60.cameraY = var2; + } + } + + if (class60.cameraY > var2) { + class60.cameraY -= WorldMapData_0.field92 * (class60.cameraY - var2) / 1000 + HitSplatDefinition.field3312; + if (class60.cameraY < var2) { + class60.cameraY = var2; + } + } + + if (UserComparator9.cameraZ < var1) { + UserComparator9.cameraZ = (var1 - UserComparator9.cameraZ) * WorldMapData_0.field92 / 1000 + UserComparator9.cameraZ + HitSplatDefinition.field3312; + if (UserComparator9.cameraZ > var1) { + UserComparator9.cameraZ = var1; + } + } + + if (UserComparator9.cameraZ > var1) { + UserComparator9.cameraZ -= WorldMapData_0.field92 * (UserComparator9.cameraZ - var1) / 1000 + HitSplatDefinition.field3312; + if (UserComparator9.cameraZ < var1) { + UserComparator9.cameraZ = var1; + } + } + + var0 = class80.field1111 * 128 + 64; + var1 = Ignored.field3589 * 16384 + 64; + var2 = ScriptEvent.getTileHeight(var0, var1, UrlRequest.Client_plane) - Client.field873; + int var3 = var0 - MusicPatchNode2.cameraX; + int var4 = var2 - class60.cameraY; + int var5 = var1 - UserComparator9.cameraZ; + int var6 = (int)Math.sqrt((double)(var5 * var5 + var3 * var3)); + int var7 = (int)(Math.atan2((double)var4, (double)var6) * 325.949D) & 2047; + int var8 = (int)(Math.atan2((double)var3, (double)var5) * -325.949D) & 2047; + if (var7 < 128) { + var7 = 128; + } + + if (var7 > 383) { + var7 = 383; + } + + if (ViewportMouse.cameraPitch < var7) { + ViewportMouse.cameraPitch = (var7 - ViewportMouse.cameraPitch) * GrandExchangeOfferOwnWorldComparator.field623 / 1000 + ViewportMouse.cameraPitch + PacketBufferNode.field2310; + if (ViewportMouse.cameraPitch > var7) { + ViewportMouse.cameraPitch = var7; + } + } + + if (ViewportMouse.cameraPitch > var7) { + ViewportMouse.cameraPitch -= GrandExchangeOfferOwnWorldComparator.field623 * (ViewportMouse.cameraPitch - var7) / 1000 + PacketBufferNode.field2310; + if (ViewportMouse.cameraPitch < var7) { + ViewportMouse.cameraPitch = var7; + } + } + + int var9 = var8 - WorldMapLabelSize.cameraYaw; + if (var9 > 1024) { + var9 -= 2048; + } + + if (var9 < -1024) { + var9 += 2048; + } + + if (var9 > 0) { + WorldMapLabelSize.cameraYaw = WorldMapLabelSize.cameraYaw + PacketBufferNode.field2310 + var9 * GrandExchangeOfferOwnWorldComparator.field623 / 1000; + WorldMapLabelSize.cameraYaw &= 2047; + } + + if (var9 < 0) { + WorldMapLabelSize.cameraYaw -= PacketBufferNode.field2310 + -var9 * GrandExchangeOfferOwnWorldComparator.field623 / 1000; + WorldMapLabelSize.cameraYaw &= 2047; + } + + int var10 = var8 - WorldMapLabelSize.cameraYaw; + if (var10 > 1024) { + var10 -= 2048; + } + + if (var10 < -1024) { + var10 += 2048; + } + + if (var10 < 0 && var9 > 0 || var10 > 0 && var9 < 0) { + WorldMapLabelSize.cameraYaw = var8; + } + } } diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java index 740f9cdbe9..2441f5fbc2 100644 --- a/runescape-client/src/main/java/StudioGame.java +++ b/runescape-client/src/main/java/StudioGame.java @@ -4,52 +4,54 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("he") +@ObfuscatedName("hq") @Implements("StudioGame") public enum StudioGame implements Enumerated { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lhe;" + signature = "Lhq;" ) @Export("runescape") runescape("runescape", "RuneScape", 0), - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lhe;" + signature = "Lhq;" ) @Export("stellardawn") stellardawn("stellardawn", "Stellar Dawn", 1), - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lhe;" + signature = "Lhq;" ) @Export("game3") game3("game3", "Game 3", 2), - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lhe;" + signature = "Lhq;" ) @Export("game4") game4("game4", "Game 4", 3), - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lhe;" + signature = "Lhq;" ) @Export("game5") game5("game5", "Game 5", 4), - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "Lhe;" + signature = "Lhq;" ) @Export("oldscape") oldscape("oldscape", "RuneScape 2007", 5); @ObfuscatedName("h") + static String field3092; + @ObfuscatedName("e") @Export("name") public final String name; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 366525809 + intValue = 1105236049 ) @Export("id") final int id; @@ -59,243 +61,172 @@ public enum StudioGame implements Enumerated { this.id = var5; } - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "7" + garbageValue = "-57" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;Llg;I)Ljava/lang/String;", - garbageValue = "-1208620842" + signature = "(IIIIIZB)Lls;", + garbageValue = "16" ) - public static String method4228(CharSequence var0, LoginType var1) { - if (var0 == null) { + @Export("getItemSprite") + public static final Sprite getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { + if (var1 == -1) { + var4 = 0; + } else if (var4 == 2 && var1 != 1) { + var4 = 1; + } + + long var6 = ((long)var4 << 40) + ((long)var2 << 38) + ((long)var1 << 16) + (long)var0 + ((long)var3 << 42); + Sprite var8; + if (!var5) { + var8 = (Sprite)ItemDefinition.ItemDefinition_cachedSprites.get(var6); + if (var8 != null) { + return var8; + } + } + + ItemDefinition var9 = PacketBufferNode.ItemDefinition_get(var0); + if (var1 > 1 && var9.countobj != null) { + int var10 = -1; + + for (int var11 = 0; var11 < 10; ++var11) { + if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { + var10 = var9.countobj[var11]; + } + } + + if (var10 != -1) { + var9 = PacketBufferNode.ItemDefinition_get(var10); + } + } + + Model var19 = var9.getModel(1); + if (var19 == null) { return null; } else { - 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; + 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; } } - while (var3 > var2) { - var5 = var0.charAt(var3 - 1); - var4 = var5 == 160 || var5 == ' ' || var5 == '_' || var5 == '-'; - if (!var4) { - break; - } - - --var3; + int[] var12 = Rasterizer2D.Rasterizer2D_pixels; + int var13 = Rasterizer2D.Rasterizer2D_width; + int var14 = Rasterizer2D.Rasterizer2D_height; + int[] var15 = new int[4]; + Rasterizer2D.Rasterizer2D_getClipArray(var15); + var8 = new Sprite(36, 32); + Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); + Rasterizer2D.Rasterizer2D_clear(); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); + Rasterizer3D.method3086(16, 16); + Rasterizer3D.field1739 = false; + if (var9.placeholderTemplate != -1) { + var20.drawTransBgAt(0, 0); } - int var14 = var3 - var2; - if (var14 >= 1) { - byte var6; - if (var1 == null) { - var6 = 12; - } else { - switch(var1.field4032) { - case 6: - 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 (Varcs.isAlphaNumeric(var7)) { - var8 = true; - } else { - char[] var13 = class338.field4034; - int var10 = 0; - - label117: - while (true) { - char var11; - if (var10 >= var13.length) { - var13 = class338.field4037; - - for (var10 = 0; var10 < var13.length; ++var10) { - var11 = var13[var10]; - if (var11 == var7) { - var8 = true; - break label117; - } - } - - var8 = false; - break; - } - - var11 = var13[var10]; - if (var7 == var11) { - var8 = true; - break; - } - - ++var10; - } - } - - 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(); - } + int var16 = var9.zoom2d; + if (var5) { + var16 = (int)(1.5D * (double)var16); + } else if (var2 == 2) { + var16 = (int)((double)var16 * 1.04D); } + int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; + int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; + var19.calculateBoundsCylinder(); + var19.method2907(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var19.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); + if (var9.notedId != -1) { + var20.drawTransBgAt(0, 0); + } + + if (var2 >= 1) { + var8.outline(1); + } + + if (var2 >= 2) { + var8.outline(16777215); + } + + if (var3 != 0) { + var8.shadow(var3); + } + + Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); + if (var9.noteTemplate != -1) { + var20.drawTransBgAt(0, 0); + } + + if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { + ReflectionCheck.ItemDefinition_fontPlain11.draw(Projectile.method2129(var1), 0, 9, 16776960, 1); + } + + if (!var5) { + ItemDefinition.ItemDefinition_cachedSprites.put(var8, var6); + } + + Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); + Rasterizer2D.Rasterizer2D_setClipArray(var15); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); + Rasterizer3D.field1739 = true; + return var8; + } + } + + @ObfuscatedName("fa") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1629640167" + ) + static final void method4119() { + if (Client.logoutTimer > 0) { + InterfaceParent.logOut(); + } else { + Client.timer.method5025(); + class195.updateGameState(40); + VertexNormal.field1730 = Client.packetWriter.getSocket(); + Client.packetWriter.removeSocket(); + } + } + + @ObfuscatedName("kg") + @ObfuscatedSignature( + signature = "(Lha;I)Lha;", + garbageValue = "-525522937" + ) + static Widget method4116(Widget var0) { + int var1 = class339.method6563(WorldMapSection0.getWidgetClickMask(var0)); + if (var1 == 0) { return null; + } else { + for (int var2 = 0; var2 < var1; ++var2) { + var0 = Tile.getWidget(var0.parentId); + if (var0 == null) { + return null; + } + } + + return var0; } } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(I)Lgx;", - garbageValue = "233010468" - ) - static PacketBufferNode method4225() { - return PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0 ? new PacketBufferNode() : PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "([BB)Ljava/lang/String;", - garbageValue = "117" - ) - public static String method4220(byte[] var0) { - return class195.method3739(var0, 0, var0.length); - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "(CLgc;I)I", - garbageValue = "-85765138" - ) - @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/Task.java b/runescape-client/src/main/java/Task.java index 98f53cf1c1..07ab3d74d4 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("fo") +@ObfuscatedName("fu") @Implements("Task") public class Task { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lfo;" + signature = "Lfu;" ) @Export("next") Task next; - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("status") public volatile int status; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 400750529 + intValue = -2104654437 ) @Export("type") int type; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("intArgument") public int intArgument; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("objectArgument") Object objectArgument; - @ObfuscatedName("w") + @ObfuscatedName("a") @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 b663bfb37a..69134c2f3e 100644 --- a/runescape-client/src/main/java/TaskHandler.java +++ b/runescape-client/src/main/java/TaskHandler.java @@ -7,31 +7,31 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fu") +@ObfuscatedName("fl") @Implements("TaskHandler") public class TaskHandler implements Runnable { - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("javaVendor") public static String javaVendor; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("javaVersion") public static String javaVersion; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lfo;" + signature = "Lfu;" ) @Export("current") Task current; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lfo;" + signature = "Lfu;" ) @Export("task") Task task; - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("thread") Thread thread; - @ObfuscatedName("p") + @ObfuscatedName("b") @Export("isClosed") boolean isClosed; @@ -55,10 +55,10 @@ public class TaskHandler implements Runnable { this.thread.start(); } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1951824555" + garbageValue = "1570179220" ) @Export("close") public final void close() { @@ -74,10 +74,10 @@ public class TaskHandler implements Runnable { } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IIILjava/lang/Object;B)Lfo;", - garbageValue = "1" + signature = "(IIILjava/lang/Object;B)Lfu;", + garbageValue = "-52" ) @Export("newTask") final Task newTask(int var1, int var2, int var3, Object var4) { @@ -98,20 +98,20 @@ public class TaskHandler implements Runnable { } } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Ljava/lang/String;II)Lfo;", - garbageValue = "456195098" + signature = "(Ljava/lang/String;II)Lfu;", + garbageValue = "-1049494534" ) @Export("newSocketTask") public final Task newSocketTask(String var1, int var2) { return this.newTask(1, var2, 0, var1); } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Ljava/lang/Runnable;II)Lfo;", - garbageValue = "1003656831" + signature = "(Ljava/lang/Runnable;II)Lfu;", + garbageValue = "1021104095" ) @Export("newThreadTask") public final Task newThreadTask(Runnable var1, int var2) { @@ -166,19 +166,64 @@ public class TaskHandler implements Runnable { } } - @ObfuscatedName("u") + @ObfuscatedName("gn") @ObfuscatedSignature( - signature = "(I)J", - garbageValue = "-1924215879" + signature = "(Ljava/lang/String;I)V", + garbageValue = "-1335905010" ) - @Export("currentTimeMillis") - public static final synchronized long currentTimeMillis() { - long var0 = System.currentTimeMillis(); - if (var0 < class296.field3695) { - class296.field3696 += class296.field3695 - var0; + @Export("doCheat") + static final void doCheat(String var0) { + if (var0.equalsIgnoreCase("toggleroof")) { + Interpreter.clientPreferences.roofsHidden = !Interpreter.clientPreferences.roofsHidden; + FriendSystem.savePreferences(); + if (Interpreter.clientPreferences.roofsHidden) { + class83.addGameMessage(99, "", "Roofs are now all hidden"); + } else { + class83.addGameMessage(99, "", "Roofs will only be removed selectively"); + } } - class296.field3695 = var0; - return class296.field3696 + var0; + if (var0.equalsIgnoreCase("displayfps")) { + Client.displayFps = !Client.displayFps; + } + + if (var0.equalsIgnoreCase("renderself")) { + Client.renderSelf = !Client.renderSelf; + } + + if (var0.equalsIgnoreCase("mouseovertext")) { + Client.showMouseOverText = !Client.showMouseOverText; + } + + if (Client.staffModLevel >= 2) { + if (var0.equalsIgnoreCase("errortest")) { + throw new RuntimeException(); + } + + if (var0.equalsIgnoreCase("showcoord")) { + GrandExchangeEvent.worldMap.showCoord = !GrandExchangeEvent.worldMap.showCoord; + } + + if (var0.equalsIgnoreCase("fpson")) { + Client.displayFps = true; + } + + if (var0.equalsIgnoreCase("fpsoff")) { + Client.displayFps = false; + } + + if (var0.equalsIgnoreCase("gc")) { + System.gc(); + } + + if (var0.equalsIgnoreCase("clientdrop")) { + StudioGame.method4119(); + } + } + + PacketBufferNode var1 = class2.getPacketBufferNode(ClientPacket.field2216, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(var0.length() + 1); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); } } diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java index e781f821d7..150f8c0be4 100644 --- a/runescape-client/src/main/java/Texture.java +++ b/runescape-client/src/main/java/Texture.java @@ -3,46 +3,46 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dv") +@ObfuscatedName("dq") @Implements("Texture") public class Texture extends Node { - @ObfuscatedName("n") + @ObfuscatedName("s") @Export("Texture_animatedPixels") static int[] Texture_animatedPixels; - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("averageRGB") int averageRGB; - @ObfuscatedName("p") - boolean field1615; - @ObfuscatedName("h") + @ObfuscatedName("b") + boolean field1602; + @ObfuscatedName("e") @Export("fileIds") int[] fileIds; - @ObfuscatedName("y") - int[] field1621; - @ObfuscatedName("w") - int[] field1618; - @ObfuscatedName("i") - int[] field1619; - @ObfuscatedName("k") + @ObfuscatedName("x") + int[] field1598; + @ObfuscatedName("a") + int[] field1596; + @ObfuscatedName("d") + int[] field1603; + @ObfuscatedName("c") @Export("animationDirection") int animationDirection; - @ObfuscatedName("x") + @ObfuscatedName("o") @Export("animationSpeed") int animationSpeed; - @ObfuscatedName("o") + @ObfuscatedName("v") @Export("pixels") int[] pixels; - @ObfuscatedName("e") + @ObfuscatedName("k") @Export("isLoaded") boolean isLoaded; @ObfuscatedSignature( - signature = "(Lkg;)V" + signature = "(Lkq;)V" ) Texture(Buffer var1) { this.isLoaded = false; this.averageRGB = var1.readUnsignedShort(); - this.field1615 = var1.readUnsignedByte() == 1; + this.field1602 = var1.readUnsignedByte() == 1; int var2 = var1.readUnsignedByte(); if (var2 >= 1 && var2 <= 4) { this.fileIds = new int[var2]; @@ -53,25 +53,25 @@ public class Texture extends Node { } if (var2 > 1) { - this.field1621 = new int[var2 - 1]; + this.field1598 = new int[var2 - 1]; for (var3 = 0; var3 < var2 - 1; ++var3) { - this.field1621[var3] = var1.readUnsignedByte(); + this.field1598[var3] = var1.readUnsignedByte(); } } if (var2 > 1) { - this.field1618 = new int[var2 - 1]; + this.field1596 = new int[var2 - 1]; for (var3 = 0; var3 < var2 - 1; ++var3) { - this.field1618[var3] = var1.readUnsignedByte(); + this.field1596[var3] = var1.readUnsignedByte(); } } - this.field1619 = new int[var2]; + this.field1603 = new int[var2]; for (var3 = 0; var3 < var2; ++var3) { - this.field1619[var3] = var1.readInt(); + this.field1603[var3] = var1.readInt(); } this.animationDirection = var1.readUnsignedByte(); @@ -82,9 +82,9 @@ public class Texture extends Node { } } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(DILhf;)Z" + signature = "(DILhz;)Z" ) @Export("load") boolean load(double var1, int var3, AbstractArchive var4) { @@ -99,11 +99,11 @@ public class Texture extends Node { this.pixels = new int[var5]; for (int var6 = 0; var6 < this.fileIds.length; ++var6) { - IndexedSprite var7 = class185.method3669(var4, this.fileIds[var6]); + IndexedSprite var7 = SecureRandomCallable.method1151(var4, this.fileIds[var6]); var7.normalize(); byte[] var8 = var7.pixels; int[] var9 = var7.palette; - int var10 = this.field1619[var6]; + int var10 = this.field1603[var6]; if ((var10 & -16777216) == 16777216) { } @@ -134,7 +134,7 @@ public class Texture extends Node { if (var6 == 0) { var11 = 0; } else { - var11 = this.field1621[var6 - 1]; + var11 = this.field1598[var6 - 1]; } if (var11 == 0) { @@ -178,13 +178,13 @@ public class Texture extends Node { return true; } - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("reset") void reset() { this.pixels = null; } - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("animate") void animate(int var1) { if (this.pixels != null) { diff --git a/runescape-client/src/main/java/TextureLoader.java b/runescape-client/src/main/java/TextureLoader.java index 54944405d2..19b5b3492b 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("ek") +@ObfuscatedName("ev") @Implements("TextureLoader") public interface TextureLoader { - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(IB)[I", - garbageValue = "-64" + signature = "(IS)[I", + garbageValue = "-13601" ) @Export("getTexturePixels") int[] getTexturePixels(int var1); - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(II)I", - garbageValue = "298398688" + garbageValue = "935962168" ) @Export("getAverageTextureRGB") int getAverageTextureRGB(int var1); - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "561655524" - ) - boolean vmethod3330(int var1); - @ObfuscatedName("p") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "-959544558" + garbageValue = "1307146254" + ) + boolean vmethod3284(int var1); + + @ObfuscatedName("b") + @ObfuscatedSignature( + signature = "(IB)Z", + garbageValue = "0" ) @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 e877cab509..e5ffa2d2da 100644 --- a/runescape-client/src/main/java/TextureProvider.java +++ b/runescape-client/src/main/java/TextureProvider.java @@ -4,54 +4,53 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("db") +@ObfuscatedName("dt") @Implements("TextureProvider") public class TextureProvider implements TextureLoader { - @ObfuscatedName("an") - @Export("hasFocus") - protected static boolean hasFocus; - @ObfuscatedName("u") + @ObfuscatedName("bz") + static String field1510; + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "[Ldv;" + signature = "[Ldq;" ) @Export("textures") Texture[] textures; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Ljd;" + signature = "Ljs;" ) @Export("deque") NodeDeque deque; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 913401883 + intValue = 580366883 ) @Export("capacity") int capacity; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -793022159 + intValue = 1830310681 ) @Export("remaining") int remaining; - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("brightness") double brightness; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1514204273 + intValue = 95221787 ) @Export("textureSize") int textureSize; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lhf;" + signature = "Lhz;" ) @Export("archive") AbstractArchive archive; @ObfuscatedSignature( - signature = "(Lhf;Lhf;IDI)V" + signature = "(Lhz;Lhz;IDI)V" ) public TextureProvider(AbstractArchive var1, AbstractArchive var2, int var3, double var4, int var6) { this.deque = new NodeDeque(); @@ -74,10 +73,10 @@ public class TextureProvider implements TextureLoader { } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1516350248" + garbageValue = "16711935" ) @Export("getLoadedPercentage") public int getLoadedPercentage() { @@ -93,7 +92,7 @@ public class TextureProvider implements TextureLoader { for (int var7 = 0; var7 < var6.length; ++var7) { int var8 = var6[var7]; - if (this.archive.method4237(var8)) { + if (this.archive.method4157(var8)) { ++var2; } } @@ -107,17 +106,17 @@ public class TextureProvider implements TextureLoader { } } - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("setBrightness") public void setBrightness(double var1) { this.brightness = var1; this.clear(); } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(IB)[I", - garbageValue = "-64" + signature = "(IS)[I", + garbageValue = "-13601" ) @Export("getTexturePixels") public int[] getTexturePixels(int var1) { @@ -147,39 +146,39 @@ public class TextureProvider implements TextureLoader { return null; } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(II)I", - garbageValue = "298398688" + garbageValue = "935962168" ) @Export("getAverageTextureRGB") public int getAverageTextureRGB(int var1) { return this.textures[var1] != null ? this.textures[var1].averageRGB : 0; } - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "561655524" - ) - public boolean vmethod3330(int var1) { - return this.textures[var1].field1615; - } - @ObfuscatedName("p") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "-959544558" + garbageValue = "1307146254" + ) + public boolean vmethod3284(int var1) { + return this.textures[var1].field1602; + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + signature = "(IB)Z", + garbageValue = "0" ) @Export("isLowDetail") public boolean isLowDetail(int var1) { return this.textureSize == 64; } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1449865056" + garbageValue = "-2025101230" ) @Export("clear") public void clear() { @@ -193,10 +192,10 @@ public class TextureProvider implements TextureLoader { this.remaining = this.capacity; } - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "248051597" + garbageValue = "1849730240" ) @Export("animate") public void animate(int var1) { @@ -210,83 +209,17 @@ public class TextureProvider implements TextureLoader { } - @ObfuscatedName("u") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(II)Lit;", - garbageValue = "1399456300" + signature = "(IB)V", + garbageValue = "67" ) - @Export("getInvDefinition") - public static InvDefinition getInvDefinition(int var0) { - InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; + public static void method2796(int var0) { + if (class197.field2392 != 0) { + class197.musicTrackVolume = var0; } 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; - } - } - - @ObfuscatedName("gu") - @ObfuscatedSignature( - signature = "(IIIB)V", - garbageValue = "14" - ) - @Export("worldToScreen") - static final void worldToScreen(int var0, int var1, int var2) { - if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { - int var3 = class195.getTileHeight(var0, var1, ClientPacket.Client_plane) - var2; - var0 -= class30.cameraX; - var3 -= GameObject.cameraY; - var1 -= FloorDecoration.cameraZ; - int var4 = Rasterizer3D.Rasterizer3D_sine[ItemContainer.cameraPitch]; - int var5 = Rasterizer3D.Rasterizer3D_cosine[ItemContainer.cameraPitch]; - int var6 = Rasterizer3D.Rasterizer3D_sine[Decimator.cameraYaw]; - int var7 = Rasterizer3D.Rasterizer3D_cosine[Decimator.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; - } - - } else { - Client.viewportTempX = -1; - Client.viewportTempY = -1; - } - } - - @ObfuscatedName("ij") - @ObfuscatedSignature( - signature = "(IIIIB)V", - garbageValue = "-94" - ) - @Export("selectSpell") - static void selectSpell(int var0, int var1, int var2, int var3) { - Widget var4 = UserComparator3.getWidgetChild(var0, var1); - if (var4 != null && var4.onTargetEnter != null) { - ScriptEvent var5 = new ScriptEvent(); - var5.widget = var4; - var5.args = var4.onTargetEnter; - WorldMapLabel.runScriptEvent(var5); + GZipDecompressor.midiPcmStream.setPcmStreamVolume(var0); } - Client.field799 = var3; - Client.isSpellSelected = true; - WorldMapAreaData.selectedSpellWidget = var0; - Client.selectedSpellChildIndex = var1; - Actor.selectedSpellFlags = var2; - ScriptEvent.invalidateWidget(var4); } } diff --git a/runescape-client/src/main/java/Tile.java b/runescape-client/src/main/java/Tile.java index c006152f1d..4261bde4fd 100644 --- a/runescape-client/src/main/java/Tile.java +++ b/runescape-client/src/main/java/Tile.java @@ -4,129 +4,129 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dm") +@ObfuscatedName("dy") @Implements("Tile") public final class Tile extends Node { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 193606079 + intValue = -1803176159 ) @Export("plane") int plane; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1934572627 + intValue = -2007130967 ) @Export("x") int x; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1222614809 + intValue = 1326950391 ) @Export("y") int y; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1168297541 + intValue = -215553835 ) @Export("originalPlane") int originalPlane; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Ley;" + signature = "Lef;" ) @Export("paint") TilePaint paint; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "Ldo;" + signature = "Ldv;" ) @Export("model") TileModel model; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Leu;" + signature = "Ler;" ) @Export("boundaryObject") BoundaryObject boundaryObject; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Let;" + signature = "Lee;" ) @Export("wallDecoration") WallDecoration wallDecoration; - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( signature = "Ldu;" ) @Export("floorDecoration") FloorDecoration floorDecoration; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lda;" + signature = "Ldc;" ) @Export("tileItemPile") TileItemPile tileItemPile; - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 595796379 + intValue = -1462066179 ) @Export("gameObjectsCount") int gameObjectsCount; - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "[Leh;" + signature = "[Lel;" ) @Export("gameObjects") GameObject[] gameObjects; - @ObfuscatedName("o") + @ObfuscatedName("v") @Export("gameObjectEdgeMasks") int[] gameObjectEdgeMasks; - @ObfuscatedName("e") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1728330701 + intValue = 2119940373 ) @Export("gameObjectsEdgeMask") int gameObjectsEdgeMask; - @ObfuscatedName("n") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -882274027 + intValue = -322964403 ) @Export("minPlane") int minPlane; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("drawPrimary") boolean drawPrimary; - @ObfuscatedName("c") + @ObfuscatedName("t") @Export("drawSecondary") boolean drawSecondary; - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("drawGameObjects") boolean drawGameObjects; - @ObfuscatedName("d") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1788905093 + intValue = -1942439905 ) @Export("drawGameObjectEdges") int drawGameObjectEdges; - @ObfuscatedName("s") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 177937909 + intValue = 413999433 ) - int field1655; - @ObfuscatedName("t") + int field1630; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 672389787 + intValue = -1503891955 ) - int field1656; + int field1640; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = -1195282039 + ) + int field1641; @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 1739431401 - ) - int field1650; - @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Ldm;" + signature = "Ldy;" ) @Export("linkedBelowTile") Tile linkedBelowTile; @@ -139,4 +139,23 @@ public final class Tile extends Node { this.x = var2; this.y = var3; } + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(IB)Lha;", + garbageValue = "0" + ) + @Export("getWidget") + public static Widget getWidget(int var0) { + int var1 = var0 >> 16; + int var2 = var0 & 65535; + if (UserComparator7.Widget_interfaceComponents[var1] == null || UserComparator7.Widget_interfaceComponents[var1][var2] == null) { + boolean var3 = MusicPatch.loadInterface(var1); + if (!var3) { + return null; + } + } + + return UserComparator7.Widget_interfaceComponents[var1][var2]; + } } diff --git a/runescape-client/src/main/java/TileItem.java b/runescape-client/src/main/java/TileItem.java index aed8722402..4f1fa3862c 100644 --- a/runescape-client/src/main/java/TileItem.java +++ b/runescape-client/src/main/java/TileItem.java @@ -4,18 +4,18 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cb") +@ObfuscatedName("ca") @Implements("TileItem") public final class TileItem extends Entity { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1378813027 + intValue = -402020319 ) @Export("id") int id; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -744056543 + intValue = 260716727 ) @Export("quantity") int quantity; @@ -23,77 +23,13 @@ public final class TileItem extends Entity { TileItem() { } - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)Ldf;", - garbageValue = "-174129419" + signature = "(I)Ldw;", + garbageValue = "822221372" ) @Export("getModel") protected final Model getModel() { - return Interpreter.ItemDefinition_get(this.id).getModel(this.quantity); - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-657071617" - ) - static int method2142() { - return ++Messages.Messages_count - 1; - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(I[BLke;I)V", - garbageValue = "261282715" - ) - static void method2144(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.field3155 == 0) { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); - } - - ArchiveDiskActionHandler.field3155 = 600; - } - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(I)[Llz;", - garbageValue = "1567603779" - ) - @Export("FillMode_values") - public static FillMode[] FillMode_values() { - return new FillMode[]{FillMode.field3854, FillMode.SOLID, FillMode.field3855}; - } - - @ObfuscatedName("km") - @ObfuscatedSignature( - signature = "(Lhl;IIIB)V", - garbageValue = "123" - ) - @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) { - class40.compass.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths); - } else { - Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); - } - - } + return PacketBufferNode.ItemDefinition_get(this.id).getModel(this.quantity); } } diff --git a/runescape-client/src/main/java/TileItemPile.java b/runescape-client/src/main/java/TileItemPile.java index f59cac9b0e..a7b433f56c 100644 --- a/runescape-client/src/main/java/TileItemPile.java +++ b/runescape-client/src/main/java/TileItemPile.java @@ -4,62 +4,61 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("da") +@ObfuscatedName("dc") @Implements("TileItemPile") public final class TileItemPile { - @ObfuscatedName("i") - public static short[][] field1537; - @ObfuscatedName("kd") + @ObfuscatedName("so") @ObfuscatedGetter( - intValue = -495854777 + longValue = 3482799438459679755L ) - @Export("menuWidth") - static int menuWidth; - @ObfuscatedName("u") + static long field1522; + @ObfuscatedName("cn") + public static char field1521; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -811612081 + intValue = 2053459421 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1672040969 + intValue = 972029952 ) @Export("x") int x; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -951728925 + intValue = 1850274101 ) @Export("y") int y; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lee;" + signature = "Lep;" ) @Export("first") Entity first; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lee;" + signature = "Lep;" ) @Export("second") Entity second; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "Lee;" + signature = "Lep;" ) @Export("third") Entity third; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - longValue = 4343367721480266293L + longValue = 6402708744668809381L ) @Export("tag") long tag; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -311771117 + intValue = 790929517 ) @Export("height") int height; @@ -67,23 +66,12 @@ public final class TileItemPile { TileItemPile() { } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(B)[Lkc;", - garbageValue = "-76" + signature = "(I)I", + garbageValue = "-2014741616" ) - static PrivateChatMode[] method2810() { - return new PrivateChatMode[]{PrivateChatMode.field3793, PrivateChatMode.field3792, PrivateChatMode.field3794}; - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1881198055" - ) - public static void method2811() { - FaceNormal.midiPcmStream.clear(); - class197.field2411 = 1; - class197.musicTrackArchive = null; + static final int method2797() { + return ViewportMouse.ViewportMouse_y; } } diff --git a/runescape-client/src/main/java/TileModel.java b/runescape-client/src/main/java/TileModel.java index 629eefa156..158d4a498c 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("do") +@ObfuscatedName("dv") @Implements("TileModel") public final class TileModel { - @ObfuscatedName("r") - static int[] field1594; - @ObfuscatedName("c") - static int[] field1595; - @ObfuscatedName("a") - static int[] field1596; - @ObfuscatedName("d") - static int[] field1599; - @ObfuscatedName("s") - static int[] field1598; + @ObfuscatedName("l") + static int[] field1578; @ObfuscatedName("t") - static final int[][] field1579; - @ObfuscatedName("m") - static final int[][] field1591; + static int[] field1579; + @ObfuscatedName("j") + static int[] field1580; + @ObfuscatedName("n") + static int[] field1564; @ObfuscatedName("u") + static int[] field1582; + @ObfuscatedName("z") + static final int[][] field1569; + @ObfuscatedName("h") + static final int[][] field1584; + @ObfuscatedName("f") @Export("vertexX") int[] vertexX; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("vertexY") int[] vertexY; - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("vertexZ") int[] vertexZ; - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("triangleColorA") int[] triangleColorA; - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("triangleColorB") int[] triangleColorB; - @ObfuscatedName("p") + @ObfuscatedName("b") @Export("triangleColorC") int[] triangleColorC; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("faceX") int[] faceX; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("faceY") int[] faceY; - @ObfuscatedName("w") + @ObfuscatedName("a") @Export("faceZ") int[] faceZ; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("triangleTextureId") int[] triangleTextureId; - @ObfuscatedName("k") + @ObfuscatedName("c") @Export("isFlat") boolean isFlat; - @ObfuscatedName("x") + @ObfuscatedName("o") @Export("shape") int shape; - @ObfuscatedName("o") + @ObfuscatedName("v") @Export("rotation") int rotation; - @ObfuscatedName("e") + @ObfuscatedName("k") @Export("underlayRgb") int underlayRgb; - @ObfuscatedName("n") + @ObfuscatedName("s") @Export("overlayRgb") int overlayRgb; static { - field1594 = new int[6]; - field1595 = new int[6]; - field1596 = new int[6]; - field1599 = new int[6]; - field1598 = new int[6]; - field1579 = 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}}; - field1591 = 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}}; + field1578 = new int[6]; + field1579 = new int[6]; + field1580 = new int[6]; + field1564 = new int[6]; + field1582 = new int[6]; + field1569 = new int[][]{{1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 2, 6}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 13, 14}}; + field1584 = new int[][]{{0, 1, 2, 3, 0, 0, 1, 3}, {1, 1, 2, 3, 1, 0, 1, 3}, {0, 1, 2, 3, 1, 0, 1, 3}, {0, 0, 1, 2, 0, 0, 2, 4, 1, 0, 4, 3}, {0, 0, 1, 4, 0, 0, 4, 3, 1, 1, 2, 4}, {0, 0, 4, 3, 1, 0, 1, 2, 1, 0, 2, 4}, {0, 1, 2, 4, 1, 0, 1, 4, 1, 0, 4, 3}, {0, 4, 1, 2, 0, 4, 2, 5, 1, 0, 4, 5, 1, 0, 5, 3}, {0, 4, 1, 2, 0, 4, 2, 3, 0, 4, 3, 5, 1, 0, 4, 5}, {0, 0, 4, 5, 1, 4, 1, 2, 1, 4, 2, 3, 1, 4, 3, 5}, {0, 0, 1, 5, 0, 1, 4, 5, 0, 1, 2, 4, 1, 0, 5, 3, 1, 5, 4, 3, 1, 4, 2, 3}, {1, 0, 1, 5, 1, 1, 4, 5, 1, 1, 2, 4, 0, 0, 5, 3, 0, 5, 4, 3, 0, 4, 2, 3}, {1, 0, 5, 4, 1, 0, 1, 5, 0, 0, 4, 3, 0, 4, 5, 3, 0, 5, 2, 3, 0, 1, 2, 5}}; } 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 = field1579[var1]; + int[] var24 = field1569[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 = field1591[var1]; + int[] var38 = field1584[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 8711d8eb06..931c8a9eb5 100644 --- a/runescape-client/src/main/java/TilePaint.java +++ b/runescape-client/src/main/java/TilePaint.java @@ -2,52 +2,46 @@ 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("ef") @Implements("TilePaint") public final class TilePaint { - @ObfuscatedName("ns") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1788868487 - ) - static int field1782; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -94402457 + intValue = 4463315 ) @Export("swColor") int swColor; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1565892331 + intValue = 404094577 ) @Export("seColor") int seColor; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 813293965 + intValue = -1273471255 ) @Export("neColor") int neColor; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1163969349 + intValue = -1327164447 ) @Export("nwColor") int nwColor; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1857222665 + intValue = 111176121 ) @Export("texture") int texture; - @ObfuscatedName("p") + @ObfuscatedName("b") @Export("isFlat") boolean isFlat; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1506842685 + intValue = -387555393 ) @Export("rgb") int rgb; @@ -62,82 +56,4 @@ public final class TilePaint { this.rgb = var6; this.isFlat = var7; } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "82" - ) - static int method3104(int var0, int var1) { - if (var0 == -2) { - return 12345678; - } else if (var0 == -1) { - if (var1 < 0) { - var1 = 0; - } else if (var1 > 127) { - var1 = 127; - } - - var1 = 127 - var1; - return var1; - } else { - var1 = (var0 & 127) * var1 / 128; - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } - - return (var0 & 65408) + var1; - } - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "(IIII)V", - garbageValue = "606674318" - ) - static final void method3105(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("g") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-770375157" - ) - public static void method3103(int var0) { - if (class197.field2411 != 0) { - class197.musicTrackVolume = var0; - } else { - FaceNormal.midiPcmStream.setPcmStreamVolume(var0); - } - - } } diff --git a/runescape-client/src/main/java/Tiles.java b/runescape-client/src/main/java/Tiles.java index 8e229594a5..1ff17e0827 100644 --- a/runescape-client/src/main/java/Tiles.java +++ b/runescape-client/src/main/java/Tiles.java @@ -3,125 +3,496 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bu") +@ObfuscatedName("bl") @Implements("Tiles") public final class Tiles { - @ObfuscatedName("u") + @ObfuscatedName("qd") + @ObfuscatedSignature( + signature = "Lcy;" + ) + @Export("pcmStreamMixer") + static PcmStreamMixer pcmStreamMixer; + @ObfuscatedName("f") @Export("Tiles_heights") static int[][][] Tiles_heights; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("Tiles_renderFlags") static byte[][][] Tiles_renderFlags; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -777969823 + intValue = 1383080381 ) @Export("Tiles_minPlane") static int Tiles_minPlane; - @ObfuscatedName("g") - static byte[][][] field498; - @ObfuscatedName("z") - static byte[][][] field499; @ObfuscatedName("p") - static byte[][][] field500; - @ObfuscatedName("h") - static byte[][][] field501; - @ObfuscatedName("i") - @Export("Tiles_hue") - static int[] Tiles_hue; - @ObfuscatedName("k") - @Export("Tiles_saturation") - static int[] Tiles_saturation; + static byte[][][] field498; + @ObfuscatedName("b") + static byte[][][] field494; + @ObfuscatedName("e") + static byte[][][] field493; @ObfuscatedName("x") - @Export("Tiles_lightness") - static int[] Tiles_lightness; - @ObfuscatedName("d") - static final int[] field505; - @ObfuscatedName("s") - static final int[] field506; - @ObfuscatedName("t") - static final int[] field507; - @ObfuscatedName("m") - static final int[] field508; + static byte[][][] field496; @ObfuscatedName("v") - static final int[] field509; + @Export("Tiles_hueMultiplier") + static int[] Tiles_hueMultiplier; + @ObfuscatedName("s") + static int[][][] field501; + @ObfuscatedName("n") + static final int[] field499; + @ObfuscatedName("u") + static final int[] field500; + @ObfuscatedName("z") + static final int[] field506; + @ObfuscatedName("h") + static final int[] field502; + @ObfuscatedName("m") + static final int[] field503; + @ObfuscatedName("g") + static final int[] field504; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -550988809 + ) + static int field505; @ObfuscatedName("q") - static final int[] field513; - @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1093475595 + intValue = -2113033627 ) - static int field511; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 1317954869 - ) - static int field503; - @ObfuscatedName("li") - @ObfuscatedSignature( - signature = "Lcg;" - ) - @Export("tempMenuAction") - static MenuAction tempMenuAction; + static int field492; static { Tiles_heights = new int[4][105][105]; Tiles_renderFlags = new byte[4][104][104]; Tiles_minPlane = 99; - field505 = new int[]{1, 2, 4, 8}; - field506 = new int[]{16, 32, 64, 128}; - field507 = new int[]{1, 0, -1, 0}; - field508 = new int[]{0, -1, 0, 1}; - field509 = new int[]{1, -1, -1, 1}; - field513 = new int[]{-1, -1, 1, 1}; - field511 = (int)(Math.random() * 17.0D) - 8; - field503 = (int)(Math.random() * 33.0D) - 16; + field499 = new int[]{1, 2, 4, 8}; + field500 = new int[]{16, 32, 64, 128}; + field506 = new int[]{1, 0, -1, 0}; + field502 = new int[]{0, -1, 0, 1}; + field503 = new int[]{1, -1, -1, 1}; + field504 = new int[]{-1, -1, 1, 1}; + field505 = (int)(Math.random() * 17.0D) - 8; + field492 = (int)(Math.random() * 33.0D) - 16; } - @ObfuscatedName("fs") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1584331485" - ) - @Export("playPcmPlayers") - static final void playPcmPlayers() { - if (class60.pcmPlayer1 != null) { - class60.pcmPlayer1.run(); - } + @ObfuscatedName("f") + public static final int method1121(double var0, double var2, double var4) { + double var6 = var4; + double var8 = var4; + double var10 = var4; + if (var2 != 0.0D) { + double var12; + if (var4 < 0.5D) { + var12 = var4 * (var2 + 1.0D); + } else { + var12 = var2 + var4 - var2 * var4; + } - if (MenuAction.pcmPlayer0 != null) { - MenuAction.pcmPlayer0.run(); - } + 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; + } - @ObfuscatedName("gc") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1685874862" - ) - static void method1161() { - if (Client.renderSelf) { - Varcs.addPlayerToScene(class215.localPlayer, false); - } + if (6.0D * var16 < 1.0D) { + var6 = var14 + var16 * (var12 - var14) * 6.0D; + } else if (var16 * 2.0D < 1.0D) { + var6 = var12; + } else if (3.0D * var16 < 2.0D) { + var6 = var14 + (0.6666666666666666D - var16) * (var12 - var14) * 6.0D; + } else { + var6 = var14; + } - } + if (var0 * 6.0D < 1.0D) { + var8 = var14 + (var12 - var14) * 6.0D * var0; + } else if (var0 * 2.0D < 1.0D) { + var8 = var12; + } else if (var0 * 3.0D < 2.0D) { + var8 = var14 + (0.6666666666666666D - var0) * (var12 - var14) * 6.0D; + } else { + var8 = var14; + } - @ObfuscatedName("go") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "2106789037" - ) - static void method1160() { - 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) { - Varcs.addPlayerToScene(Client.players[var1[var2]], true); + if (6.0D * var20 < 1.0D) { + var10 = var14 + 6.0D * (var12 - var14) * var20; + } else if (2.0D * var20 < 1.0D) { + var10 = var12; + } else if (3.0D * var20 < 2.0D) { + var10 = var14 + 6.0D * (0.6666666666666666D - var20) * (var12 - var14); + } else { + var10 = var14; } } + int var22 = (int)(256.0D * var6); + int var13 = (int)(var8 * 256.0D); + int var23 = (int)(256.0D * var10); + int var15 = var23 + (var13 << 8) + (var22 << 16); + return var15; + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "([BI)Lcu;", + garbageValue = "398974566" + ) + @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; + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)V", + garbageValue = "-2042821190" + ) + static final void method1143(String var0) { + class83.addGameMessage(30, "", var0); + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + signature = "(ILcu;ZI)I", + garbageValue = "-697994458" + ) + static int method1144(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.publicChatMode; + return 1; + } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { + class188.Interpreter_intStackSize -= 3; + Client.publicChatMode = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + Calendar.privateChatMode = class50.method893(Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]); + if (Calendar.privateChatMode == null) { + Calendar.privateChatMode = PrivateChatMode.field3791; + } + + Client.tradeChatMode = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 2]; + PacketBufferNode var18 = class2.getPacketBufferNode(ClientPacket.field2175, Client.packetWriter.isaacCipher); + var18.packetBuffer.writeByte(Client.publicChatMode); + var18.packetBuffer.writeByte(Calendar.privateChatMode.field3793); + var18.packetBuffer.writeByte(Client.tradeChatMode); + Client.packetWriter.addNode(var18); + return 1; + } else { + String var3; + int var4; + if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { + var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + class188.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + int var5 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + PacketBufferNode var6 = class2.getPacketBufferNode(ClientPacket.field2221, Client.packetWriter.isaacCipher); + var6.packetBuffer.writeByte(ViewportMouse.stringCp1252NullTerminatedByteSize(var3) + 2); + var6.packetBuffer.writeStringCp1252NullTerminated(var3); + var6.packetBuffer.writeByte(var4 - 1); + var6.packetBuffer.writeByte(var5); + Client.packetWriter.addNode(var6); + return 1; + } else { + int var10; + if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { + class188.Interpreter_intStackSize -= 2; + var10 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + Message var15 = class210.Messages_getByChannelAndID(var10, var4); + if (var15 != null) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var15.count; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var15.cycle; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var15.sender != null ? var15.sender : ""; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var15.prefix != null ? var15.prefix : ""; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var15.text != null ? var15.text : ""; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var15.isFromFriend() ? 1 : (var15.isFromIgnored() ? 2 : 0); + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { + var10 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + Message var16 = LoginPacket.Messages_getMessage(var10); + if (var16 != null) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var16.type; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var16.cycle; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var16.sender != null ? var16.sender : ""; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var16.prefix != null ? var16.prefix : ""; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var16.text != null ? var16.text : ""; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var16.isFromFriend() ? 1 : (var16.isFromIgnored() ? 2 : 0); + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { + if (Calendar.privateChatMode == null) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Calendar.privateChatMode.field3793; + } + + return 1; + } else if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { + var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + String var14 = var3.toLowerCase(); + byte var17 = 0; + if (var14.startsWith("yellow:")) { + var17 = 0; + var3 = var3.substring("yellow:".length()); + } else if (var14.startsWith("red:")) { + var17 = 1; + var3 = var3.substring("red:".length()); + } else if (var14.startsWith("green:")) { + var17 = 2; + var3 = var3.substring("green:".length()); + } else if (var14.startsWith("cyan:")) { + var17 = 3; + var3 = var3.substring("cyan:".length()); + } else if (var14.startsWith("purple:")) { + var17 = 4; + var3 = var3.substring("purple:".length()); + } else if (var14.startsWith("white:")) { + var17 = 5; + var3 = var3.substring("white:".length()); + } else if (var14.startsWith("flash1:")) { + var17 = 6; + var3 = var3.substring("flash1:".length()); + } else if (var14.startsWith("flash2:")) { + var17 = 7; + var3 = var3.substring("flash2:".length()); + } else if (var14.startsWith("flash3:")) { + var17 = 8; + var3 = var3.substring("flash3:".length()); + } else if (var14.startsWith("glow1:")) { + var17 = 9; + var3 = var3.substring("glow1:".length()); + } else if (var14.startsWith("glow2:")) { + var17 = 10; + var3 = var3.substring("glow2:".length()); + } else if (var14.startsWith("glow3:")) { + var17 = 11; + var3 = var3.substring("glow3:".length()); + } else if (Varps.clientLanguage != Language.Language_EN) { + if (var14.startsWith("yellow:")) { + var17 = 0; + var3 = var3.substring("yellow:".length()); + } else if (var14.startsWith("red:")) { + var17 = 1; + var3 = var3.substring("red:".length()); + } else if (var14.startsWith("green:")) { + var17 = 2; + var3 = var3.substring("green:".length()); + } else if (var14.startsWith("cyan:")) { + var17 = 3; + var3 = var3.substring("cyan:".length()); + } else if (var14.startsWith("purple:")) { + var17 = 4; + var3 = var3.substring("purple:".length()); + } else if (var14.startsWith("white:")) { + var17 = 5; + var3 = var3.substring("white:".length()); + } else if (var14.startsWith("flash1:")) { + var17 = 6; + var3 = var3.substring("flash1:".length()); + } else if (var14.startsWith("flash2:")) { + var17 = 7; + var3 = var3.substring("flash2:".length()); + } else if (var14.startsWith("flash3:")) { + var17 = 8; + var3 = var3.substring("flash3:".length()); + } else if (var14.startsWith("glow1:")) { + var17 = 9; + var3 = var3.substring("glow1:".length()); + } else if (var14.startsWith("glow2:")) { + var17 = 10; + var3 = var3.substring("glow2:".length()); + } else if (var14.startsWith("glow3:")) { + var17 = 11; + var3 = var3.substring("glow3:".length()); + } + } + + var14 = var3.toLowerCase(); + byte var7 = 0; + if (var14.startsWith("wave:")) { + var7 = 1; + var3 = var3.substring("wave:".length()); + } else if (var14.startsWith("wave2:")) { + var7 = 2; + var3 = var3.substring("wave2:".length()); + } else if (var14.startsWith("shake:")) { + var7 = 3; + var3 = var3.substring("shake:".length()); + } else if (var14.startsWith("scroll:")) { + var7 = 4; + var3 = var3.substring("scroll:".length()); + } else if (var14.startsWith("slide:")) { + var7 = 5; + var3 = var3.substring("slide:".length()); + } else if (Varps.clientLanguage != Language.Language_EN) { + if (var14.startsWith("wave:")) { + var7 = 1; + var3 = var3.substring("wave:".length()); + } else if (var14.startsWith("wave2:")) { + var7 = 2; + var3 = var3.substring("wave2:".length()); + } else if (var14.startsWith("shake:")) { + var7 = 3; + var3 = var3.substring("shake:".length()); + } else if (var14.startsWith("scroll:")) { + var7 = 4; + var3 = var3.substring("scroll:".length()); + } else if (var14.startsWith("slide:")) { + var7 = 5; + var3 = var3.substring("slide:".length()); + } + } + + PacketBufferNode var8 = class2.getPacketBufferNode(ClientPacket.field2249, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeByte(0); + int var9 = var8.packetBuffer.offset; + var8.packetBuffer.writeByte(var4); + var8.packetBuffer.writeByte(var17); + var8.packetBuffer.writeByte(var7); + GrandExchangeOfferUnitPriceComparator.method122(var8.packetBuffer, var3); + var8.packetBuffer.writeLengthByte(var8.packetBuffer.offset - var9); + Client.packetWriter.addNode(var8); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { + class65.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[class65.Interpreter_stringStackSize]; + String var12 = Interpreter.Interpreter_stringStack[class65.Interpreter_stringStackSize + 1]; + PacketBufferNode var11 = class2.getPacketBufferNode(ClientPacket.field2177, Client.packetWriter.isaacCipher); + var11.packetBuffer.writeShort(0); + int var13 = var11.packetBuffer.offset; + var11.packetBuffer.writeStringCp1252NullTerminated(var3); + GrandExchangeOfferUnitPriceComparator.method122(var11.packetBuffer, var12); + var11.packetBuffer.writeLengthShort(var11.packetBuffer.offset - var13); + Client.packetWriter.addNode(var11); + return 1; + } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { + if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.tradeChatMode; + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { + var10 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = MouseHandler.Messages_getHistorySize(var10); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { + var10 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = WorldMapSection0.Messages_getNextChatID(var10); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { + var10 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = AttackOption.Messages_getLastChatID(var10); + return 1; + } else if (var0 == ScriptOpcodes.DOCHEAT) { + var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + TaskHandler.doCheat(var3); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { + Client.field846 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize].toLowerCase().trim(); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = Client.field846; + return 1; + } else if (var0 == ScriptOpcodes.DEBUGMES) { + var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + System.out.println(var3); + return 1; + } else { + return 2; + } + } else { + if (Message.localPlayer != null && Message.localPlayer.username != null) { + var3 = Message.localPlayer.username.getName(); + } else { + var3 = ""; + } + + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3; + return 1; + } + } + } } } diff --git a/runescape-client/src/main/java/Timer.java b/runescape-client/src/main/java/Timer.java index 3d21d60b45..27b1751b18 100644 --- a/runescape-client/src/main/java/Timer.java +++ b/runescape-client/src/main/java/Timer.java @@ -3,514 +3,166 @@ 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("jl") +@ObfuscatedName("jx") @Implements("Timer") public class Timer { - @ObfuscatedName("u") - @ObfuscatedGetter( - longValue = -6240024942986878869L - ) - long field3584; @ObfuscatedName("f") @ObfuscatedGetter( - longValue = 5318083601212368839L + longValue = 1687468324454291725L ) - long field3580; - @ObfuscatedName("b") - public boolean field3581; - @ObfuscatedName("g") - @ObfuscatedGetter( - longValue = 2061112075128540571L - ) - long field3582; - @ObfuscatedName("z") - @ObfuscatedGetter( - longValue = 2026371982134208439L - ) - long field3583; - @ObfuscatedName("p") - @ObfuscatedGetter( - longValue = 689838132485395985L - ) - long field3579; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 84967575 - ) - int field3585; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = 1608958001 - ) - int field3586; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -1078604545 - ) - int field3588; + long field3560; @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1631657249 + longValue = 7655978754782259035L ) - int field3587; + long field3554; + @ObfuscatedName("y") + public boolean field3555; + @ObfuscatedName("w") + @ObfuscatedGetter( + longValue = 1665338134164527579L + ) + long field3556; + @ObfuscatedName("p") + @ObfuscatedGetter( + longValue = -779441764559487179L + ) + long field3559; + @ObfuscatedName("b") + @ObfuscatedGetter( + longValue = 4469164127837216533L + ) + long field3558; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 602333417 + ) + int field3562; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 1059100831 + ) + int field3557; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 1625866105 + ) + int field3561; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -463850423 + ) + int field3563; public Timer() { - this.field3584 = -1L; - this.field3580 = -1L; - this.field3581 = false; - this.field3582 = 0L; - this.field3583 = 0L; - this.field3579 = 0L; - this.field3585 = 0; - this.field3586 = 0; - this.field3588 = 0; - this.field3587 = 0; - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "233565560" - ) - public void method5071() { - this.field3584 = TaskHandler.currentTimeMillis(); + this.field3560 = -1L; + this.field3554 = -1L; + this.field3555 = false; + this.field3556 = 0L; + this.field3559 = 0L; + this.field3558 = 0L; + this.field3562 = 0; + this.field3557 = 0; + this.field3561 = 0; + this.field3563 = 0; } @ObfuscatedName("f") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "2022402966" + garbageValue = "-1677674321" ) - public void method5072() { - if (-1L != this.field3584) { - this.field3583 = TaskHandler.currentTimeMillis() - this.field3584; - this.field3584 = -1L; + public void method5016() { + this.field3560 = WorldMapID.currentTimeMillis(); + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "608753777" + ) + public void method5025() { + if (-1L != this.field3560) { + this.field3559 = WorldMapID.currentTimeMillis() - this.field3560; + this.field3560 = -1L; } } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-290587074" + garbageValue = "45949945" ) - public void method5073(int var1) { - this.field3580 = TaskHandler.currentTimeMillis(); - this.field3585 = var1; + public void method5017(int var1) { + this.field3554 = WorldMapID.currentTimeMillis(); + this.field3562 = var1; } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1294932031" + garbageValue = "1761247014" ) - public void method5079() { - if (this.field3580 != -1L) { - this.field3582 = TaskHandler.currentTimeMillis() - this.field3580; - this.field3580 = -1L; + public void method5037() { + if (this.field3554 != -1L) { + this.field3556 = WorldMapID.currentTimeMillis() - this.field3554; + this.field3554 = -1L; } - ++this.field3588; - this.field3581 = true; - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "65408" - ) - public void method5075() { - this.field3581 = false; - this.field3586 = 0; + ++this.field3561; + this.field3555 = true; } @ObfuscatedName("p") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1988962701" + garbageValue = "-1677674321" ) - public void method5076() { - this.method5079(); + public void method5039() { + this.field3555 = false; + this.field3557 = 0; } - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(Lkg;I)V", - garbageValue = "817324338" + signature = "(I)V", + garbageValue = "541541745" + ) + public void method5020() { + this.method5037(); + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "(Lkq;I)V", + garbageValue = "1449461967" ) @Export("write") public void write(Buffer var1) { - VertexNormal.method3019(var1, this.field3583); - VertexNormal.method3019(var1, this.field3582); - VertexNormal.method3019(var1, this.field3579); - var1.writeShort(this.field3585); - var1.writeShort(this.field3586); - var1.writeShort(this.field3588); - var1.writeShort(this.field3587); + MusicPatchNode2.method3670(var1, this.field3559); + MusicPatchNode2.method3670(var1, this.field3556); + MusicPatchNode2.method3670(var1, this.field3558); + var1.writeShort(this.field3562); + var1.writeShort(this.field3557); + var1.writeShort(this.field3561); + var1.writeShort(this.field3563); } - @ObfuscatedName("l") + @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "(ILci;ZI)I", - garbageValue = "1563555840" + signature = "([BIII)I", + garbageValue = "880088989" ) - static int method5098(int var0, Script var1, boolean var2) { - String var3; - if (var0 == ScriptOpcodes.MES) { - var3 = Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]; - GrandExchangeOfferAgeComparator.addGameMessage(0, "", var3); - return 1; - } else if (var0 == ScriptOpcodes.ANIM) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - WorldMapRectangle.performPlayerAnimation(class215.localPlayer, Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize], Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]); - return 1; - } else if (var0 == ScriptOpcodes.IF_CLOSE) { - if (!Interpreter.field1087) { - Interpreter.field1093 = true; - } + public static int method5033(byte[] var0, int var1, int var2) { + int var3 = -1; - return 1; - } else { - int var10; - if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { - var3 = Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]; - var10 = 0; - if (Interpreter.isNumber(var3)) { - var10 = SoundCache.parseInt(var3); - } - - PacketBufferNode var12 = ModelData0.getPacketBufferNode(ClientPacket.field2230, 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[--class43.Interpreter_stringStackSize]; - var14 = ModelData0.getPacketBufferNode(ClientPacket.field2277, 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[--class43.Interpreter_stringStackSize]; - var14 = ModelData0.getPacketBufferNode(ClientPacket.field2256, 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[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var7 = Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]; - UserComparator5.method3466(var15, var7); - return 1; - } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 3; - var15 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var10 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - int var9 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 2]; - Widget var13 = Language.getWidget(var9); - UserComparator3.clickWidget(var13, var15, var10); - return 1; - } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var15 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var10 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - Widget var11 = var2 ? Interpreter.field1090 : class188.field2352; - UserComparator3.clickWidget(var11, var15, var10); - return 1; - } else if (var0 == ScriptOpcodes.MOUSECAM) { - JagexCache.mouseCam = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = UserComparator10.clientPreferences.roofsHidden ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { - UserComparator10.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - class40.savePreferences(); - return 1; - } else if (var0 == ScriptOpcodes.OPENURL) { - var3 = Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]; - boolean var4 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - WorldMapAreaData.openURL(var3, var4, false); - return 1; - } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { - var15 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var14 = ModelData0.getPacketBufferNode(ClientPacket.field2258, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeShort(var15); - Client.packetWriter.addNode(var14); - return 1; - } else if (var0 == ScriptOpcodes.BUG_REPORT) { - var15 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - class43.Interpreter_stringStackSize -= 2; - var7 = Interpreter.Interpreter_stringStack[class43.Interpreter_stringStackSize]; - String var5 = Interpreter.Interpreter_stringStack[class43.Interpreter_stringStackSize + 1]; - if (var7.length() > 500) { - return 1; - } else if (var5.length() > 500) { - return 1; - } else { - PacketBufferNode var6 = ModelData0.getPacketBufferNode(ClientPacket.field2290, Client.packetWriter.isaacCipher); - var6.packetBuffer.writeShort(1 + class173.stringCp1252NullTerminatedByteSize(var7) + class173.stringCp1252NullTerminatedByteSize(var5)); - var6.packetBuffer.writeStringCp1252NullTerminated(var5); - var6.packetBuffer.writeByte(var15); - var6.packetBuffer.writeStringCp1252NullTerminated(var7); - Client.packetWriter.addNode(var6); - return 1; - } - } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { - Client.shiftClickDrop = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { - Client.showMouseOverText = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.RENDERSELF) { - Client.renderSelf = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 3120) { - if (Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 1; - } else { - Client.drawPlayerNames &= -2; - } - - return 1; - } else if (var0 == 3121) { - if (Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 2; - } else { - Client.drawPlayerNames &= -3; - } - - return 1; - } else if (var0 == 3122) { - if (Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 4; - } else { - Client.drawPlayerNames &= -5; - } - - return 1; - } else if (var0 == 3123) { - if (Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.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[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { - Client.showLoadingMessages = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.SETTAPTODROP) { - Friend.setTapToDrop(Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1); - return 1; - } else if (var0 == ScriptOpcodes.GETTAPTODROP) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = MouseRecorder.getTapToDrop() ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.SETOCULUSORBSPEED) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - return 1; - } else if (var0 == 3130) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - return 1; - } else if (var0 == 3131) { - --GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize; - return 1; - } else if (var0 == ScriptOpcodes.GETCANVASSIZE) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = BoundaryObject.canvasWidth; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = WorldMapCacheName.canvasHeight; - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_SETFPS) { - --GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize; - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) { - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - return 1; - } else if (var0 == 3136) { - Client.field804 = 3; - Client.field805 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - return 1; - } else if (var0 == 3137) { - Client.field804 = 2; - Client.field805 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - return 1; - } else if (var0 == 3138) { - Client.field804 = 0; - return 1; - } else if (var0 == 3139) { - Client.field804 = 1; - return 1; - } else if (var0 == 3140) { - Client.field804 = 3; - Client.field805 = var2 ? Interpreter.field1090.id : class188.field2352.id; - return 1; - } else { - boolean var8; - if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { - var8 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - UserComparator10.clientPreferences.hideUsername = var8; - class40.savePreferences(); - return 1; - } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = UserComparator10.clientPreferences.hideUsername ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { - var8 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - Client.Login_isUsernameRemembered = var8; - if (!var8) { - UserComparator10.clientPreferences.rememberedUsername = ""; - class40.savePreferences(); - } - - return 1; - } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.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[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - if (var8 == UserComparator10.clientPreferences.titleMusicDisabled) { - UserComparator10.clientPreferences.titleMusicDisabled = !var8; - class40.savePreferences(); - } - - return 1; - } else if (var0 == ScriptOpcodes.GETTITLEMUSICENABLED) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = UserComparator10.clientPreferences.titleMusicDisabled ? 0 : 1; - return 1; - } else if (var0 == 3148) { - return 1; - } else if (var0 == 3149) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3150) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3151) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3152) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3153) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; - return 1; - } else if (var0 == 3154) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = SpotAnimationDefinition.method4509(); - return 1; - } else if (var0 == 3155) { - --class43.Interpreter_stringStackSize; - return 1; - } else if (var0 == 3156) { - return 1; - } else if (var0 == 3157) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - return 1; - } else if (var0 == 3158) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3159) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3160) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3161) { - --GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3162) { - --GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3163) { - --class43.Interpreter_stringStackSize; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3164) { - --GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; - return 1; - } else if (var0 == 3165) { - --GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3166) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3167) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3168) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; - return 1; - } else if (var0 == 3169) { - return 1; - } else if (var0 == 3170) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3171) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3172) { - --GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize; - return 1; - } else if (var0 == 3173) { - --GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3174) { - --GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize; - return 1; - } else if (var0 == 3175) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3176) { - return 1; - } else if (var0 == 3177) { - return 1; - } else if (var0 == 3178) { - --class43.Interpreter_stringStackSize; - return 1; - } else if (var0 == 3179) { - return 1; - } else if (var0 == 3180) { - --class43.Interpreter_stringStackSize; - return 1; - } else { - return 2; - } - } - } - } + for (int var4 = var1; var4 < var2; ++var4) { + var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; } + + var3 = ~var3; + return var3; } } diff --git a/runescape-client/src/main/java/TriBool.java b/runescape-client/src/main/java/TriBool.java index dde2381490..48a6159660 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("ja") +@ObfuscatedName("jf") @Implements("TriBool") public class TriBool { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lja;" + signature = "Ljf;" ) @Export("TriBool_unknown") public static final TriBool TriBool_unknown; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lja;" + signature = "Ljf;" ) @Export("TriBool_true") public static final TriBool TriBool_true; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lja;" + signature = "Ljf;" ) @Export("TriBool_false") public static final TriBool TriBool_false; @@ -34,23 +34,69 @@ public class TriBool { TriBool() { } - @ObfuscatedName("e") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "-218767973" + signature = "(Ljava/lang/CharSequence;IZB)I", + garbageValue = "29" ) - static final int method5255(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; + @Export("parseIntCustomRadix") + static int parseIntCustomRadix(CharSequence var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { + boolean var3 = false; + boolean var4 = false; + int var5 = 0; + int var6 = var0.length(); + + for (int var7 = 0; var7 < var6; ++var7) { + char var8 = var0.charAt(var7); + if (var7 == 0) { + if (var8 == '-') { + var3 = true; + continue; + } + + if (var8 == '+') { + continue; + } + } + + int var10; + if (var8 >= '0' && var8 <= '9') { + var10 = var8 - '0'; + } else if (var8 >= 'A' && var8 <= 'Z') { + var10 = var8 - '7'; + } else { + if (var8 < 'a' || var8 > 'z') { + throw new NumberFormatException(); + } + + var10 = var8 - 'W'; + } + + if (var10 >= var1) { + throw new NumberFormatException(); + } + + if (var3) { + var10 = -var10; + } + + int var9 = var5 * var1 + var10; + if (var9 / var1 != var5) { + throw new NumberFormatException(); + } + + var5 = var9; + var4 = true; } - return (var0 & 65408) + var1; + if (!var4) { + throw new NumberFormatException(); + } else { + return var5; + } + } else { + throw new IllegalArgumentException("" + var1); } } } diff --git a/runescape-client/src/main/java/UrlRequest.java b/runescape-client/src/main/java/UrlRequest.java index 1ffa77d4d1..5677c8accc 100644 --- a/runescape-client/src/main/java/UrlRequest.java +++ b/runescape-client/src/main/java/UrlRequest.java @@ -1,30 +1,35 @@ 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("ez") +@ObfuscatedName("ex") @Implements("UrlRequest") public class UrlRequest { - @ObfuscatedName("m") - public static String field1947; - @ObfuscatedName("gb") - @Export("regionMapArchives") - static byte[][] regionMapArchives; - @ObfuscatedName("gv") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "[Lln;" + signature = "Lls;" ) - @Export("headIconPrayerSprites") - static Sprite[] headIconPrayerSprites; - @ObfuscatedName("u") + @Export("leftTitleSprite") + static Sprite leftTitleSprite; + @ObfuscatedName("d") + @Export("Tiles_hue") + static int[] Tiles_hue; + @ObfuscatedName("jr") + @ObfuscatedGetter( + intValue = -1130751947 + ) + @Export("Client_plane") + static int Client_plane; + @ObfuscatedName("f") @Export("url") final URL url; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("isDone0") volatile boolean isDone0; - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("response0") volatile byte[] response0; @@ -32,78 +37,23 @@ public class UrlRequest { this.url = var1; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "1603935718" + garbageValue = "186206860" ) @Export("isDone") public boolean isDone() { return this.isDone0; } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(I)[B", - garbageValue = "-66601461" + garbageValue = "-2113635317" ) @Export("getResponse") public byte[] getResponse() { return this.response0; } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(Lkj;II)V", - garbageValue = "1138294820" - ) - @Export("updatePlayers") - static final void updatePlayers(PacketBuffer var0, int var1) { - int var2 = var0.offset; - Players.Players_pendingUpdateCount = 0; - GraphicsObject.method2041(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 & 4) != 0) { - var6 += var0.readUnsignedByte() << 8; - } - - Players.method2167(var0, var4, var5, var6); - } - - if (var0.offset - var2 != var1) { - throw new RuntimeException(var0.offset - var2 + " " + var1); - } - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-791590790" - ) - public static void method3358(int var0) { - class197.field2411 = 1; - class197.musicTrackArchive = null; - UrlRequester.musicTrackGroupId = -1; - UserComparator7.musicTrackFileId = -1; - class197.musicTrackVolume = 0; - ArchiveLoader.musicTrackBoolean = false; - class335.field4014 = var0; - } - - @ObfuscatedName("kz") - @ObfuscatedSignature( - signature = "(Lhl;II)Ljava/lang/String;", - garbageValue = "-1934633021" - ) - static String method3361(Widget var0, int var1) { - if (!WorldMapManager.method651(MenuAction.getWidgetClickMask(var0), var1) && 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/UrlRequester.java b/runescape-client/src/main/java/UrlRequester.java index 2e5b04c88b..d646c2b516 100644 --- a/runescape-client/src/main/java/UrlRequester.java +++ b/runescape-client/src/main/java/UrlRequester.java @@ -7,34 +7,20 @@ import java.util.LinkedList; import java.util.Queue; 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("ew") +@ObfuscatedName("eo") @Implements("UrlRequester") public class UrlRequester implements Runnable { - @ObfuscatedName("g") - @Export("SpriteBuffer_xOffsets") - static int[] SpriteBuffer_xOffsets; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 1446688081 - ) - @Export("musicTrackGroupId") - public static int musicTrackGroupId; - @ObfuscatedName("ez") - @ObfuscatedGetter( - intValue = 2240241 - ) - static int field1940; - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("thread") final Thread thread; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("isClosed") volatile boolean isClosed; - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("requests") Queue requests; @@ -45,10 +31,10 @@ public class UrlRequester implements Runnable { this.thread.start(); } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Ljava/net/URL;I)Lez;", - garbageValue = "-1482865280" + signature = "(Ljava/net/URL;I)Lex;", + garbageValue = "-970365901" ) @Export("request") public UrlRequest request(URL var1) { @@ -60,10 +46,10 @@ public class UrlRequester implements Runnable { } } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1184631073" + garbageValue = "1622964720" ) @Export("close") public void close() { @@ -126,59 +112,161 @@ public class UrlRequester implements Runnable { } } catch (Exception var17) { - Calendar.RunException_sendStackTrace((String)null, var17); + DesktopPlatformInfoProvider.RunException_sendStackTrace((String)null, var17); } } } - @ObfuscatedName("fn") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lhl;III)V", - garbageValue = "-311109271" + signature = "(ILcu;ZI)I", + garbageValue = "360397660" ) - @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 || !JagexCache.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { - SpriteMask var3 = var0.getSpriteMask(true); - if (var3 == null) { - return; - } + static int method3306(int var0, Script var1, boolean var2) { + boolean var3 = true; + Widget var4; + if (var0 >= 2000) { + var0 -= 1000; + var4 = Tile.getWidget(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); + var3 = false; + } else { + var4 = var2 ? UserComparator7.field1946 : class197.field2398; + } - int var4 = MouseHandler.MouseHandler_lastPressedX - var1; - int var5 = MouseHandler.MouseHandler_lastPressedY - var2; - if (var3.contains(var4, var5)) { - var4 -= var3.width / 2; - var5 -= var3.height / 2; - int var6 = Client.camAngleY & 2047; - int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; - int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; - int var9 = var7 * var5 + var8 * var4 >> 11; - int var10 = var5 * var8 - var4 * var7 >> 11; - int var11 = var9 + class215.localPlayer.x >> 7; - int var12 = class215.localPlayer.y - var10 >> 7; - PacketBufferNode var13 = ModelData0.getPacketBufferNode(ClientPacket.field2282, Client.packetWriter.isaacCipher); - var13.packetBuffer.writeByte(18); - var13.packetBuffer.method5636(class51.baseX * 64 + var11); - var13.packetBuffer.method5628(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); - var13.packetBuffer.method5636(VarcInt.baseY * 64 + var12); - var13.packetBuffer.writeByte(var4); - var13.packetBuffer.writeByte(var5); - var13.packetBuffer.writeShort(Client.camAngleY); - var13.packetBuffer.writeByte(57); - var13.packetBuffer.writeByte(0); - var13.packetBuffer.writeByte(0); - var13.packetBuffer.writeByte(89); - var13.packetBuffer.writeShort(class215.localPlayer.x); - var13.packetBuffer.writeShort(class215.localPlayer.y); - var13.packetBuffer.writeByte(63); - Client.packetWriter.addNode(var13); - Client.destinationX = var11; - Client.destinationY = var12; + int var11; + if (var0 == ScriptOpcodes.CC_SETOP) { + var11 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] - 1; + if (var11 >= 0 && var11 <= 9) { + var4.setAction(var11, Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]); + return 1; + } else { + --class65.Interpreter_stringStackSize; + return 1; + } + } else { + int var6; + if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { + class188.Interpreter_intStackSize -= 2; + var11 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var6 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + var4.parent = BZip2State.getWidgetChild(var11, var6); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { + var4.isScrollBar = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { + var4.dragZoneSize = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { + var4.dragThreshold = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { + var4.dataText = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { + var4.spellActionName = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { + var4.actions = null; + return 1; + } else if (var0 == 1308) { + var4.field2602 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + return 1; + } else { + int var7; + byte[] var9; + if (var0 != ScriptOpcodes.CC_SETOPKEY) { + byte var5; + if (var0 == ScriptOpcodes.CC_SETOPTKEY) { + class188.Interpreter_intStackSize -= 2; + var5 = 10; + var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]}; + byte[] var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]}; + AttackOption.Widget_setKey(var4, var5, var9, var10); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { + class188.Interpreter_intStackSize -= 3; + var11 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize] - 1; + var6 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + var7 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 2]; + if (var11 >= 0 && var11 <= 9) { + GrandExchangeOfferUnitPriceComparator.Widget_setKeyRate(var4, var11, var6, var7); + return 1; + } else { + throw new RuntimeException(); + } + } else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { + var5 = 10; + var6 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + GrandExchangeOfferUnitPriceComparator.Widget_setKeyRate(var4, var5, var6, var7); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { + --class188.Interpreter_intStackSize; + var11 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize] - 1; + if (var11 >= 0 && var11 <= 9) { + WorldMapCacheName.Widget_setKeyIgnoreHeld(var4, var11); + return 1; + } else { + throw new RuntimeException(); + } + } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { + var5 = 10; + WorldMapCacheName.Widget_setKeyIgnoreHeld(var4, var5); + return 1; + } else { + return 2; + } + } else { + byte[] var8 = null; + var9 = null; + if (var3) { + class188.Interpreter_intStackSize -= 10; + + for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + class188.Interpreter_intStackSize] >= 0; var7 += 2) { + } + + if (var7 > 0) { + var8 = new byte[var7 / 2]; + var9 = new byte[var7 / 2]; + + for (var7 -= 2; var7 >= 0; var7 -= 2) { + var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class188.Interpreter_intStackSize]; + var9[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class188.Interpreter_intStackSize + 1]; + } + } + } else { + class188.Interpreter_intStackSize -= 2; + var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]}; + var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]}; + } + + var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] - 1; + if (var7 >= 0 && var7 <= 9) { + AttackOption.Widget_setKey(var4, var7, var8, var9); + return 1; + } else { + throw new RuntimeException(); + } } } - } } + + @ObfuscatedName("a") + @ObfuscatedSignature( + signature = "(Ljava/lang/CharSequence;B)I", + garbageValue = "0" + ) + public static int method3299(CharSequence var0) { + int var1 = var0.length(); + int var2 = 0; + + for (int var3 = 0; var3 < var1; ++var3) { + var2 = (var2 << 5) - var2 + var0.charAt(var3); + } + + return var2; + } } diff --git a/runescape-client/src/main/java/User.java b/runescape-client/src/main/java/User.java index 57164c4a6c..022d496388 100644 --- a/runescape-client/src/main/java/User.java +++ b/runescape-client/src/main/java/User.java @@ -3,18 +3,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jr") +@ObfuscatedName("jy") @Implements("User") public class User implements Comparable { - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Ljb;" + signature = "Ljc;" ) @Export("username") Username username; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Ljb;" + signature = "Ljc;" ) @Export("previousUsername") Username previousUsername; @@ -22,40 +22,40 @@ public class User implements Comparable { User() { } - @ObfuscatedName("c") + @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "(I)Ljb;", - garbageValue = "167641861" + signature = "(I)Ljc;", + garbageValue = "-1900146803" ) @Export("getUsername") public Username getUsername() { return this.username; } - @ObfuscatedName("s") + @ObfuscatedName("an") @ObfuscatedSignature( - signature = "(B)Ljava/lang/String;", - garbageValue = "-1" + signature = "(I)Ljava/lang/String;", + garbageValue = "2043708876" ) @Export("getName") public String getName() { return this.username == null ? "" : this.username.getName(); } - @ObfuscatedName("t") + @ObfuscatedName("ar") @ObfuscatedSignature( signature = "(B)Ljava/lang/String;", - garbageValue = "1" + garbageValue = "16" ) @Export("getPreviousName") public String getPreviousName() { return this.previousUsername == null ? "" : this.previousUsername.getName(); } - @ObfuscatedName("m") + @ObfuscatedName("az") @ObfuscatedSignature( - signature = "(Ljb;Ljb;I)V", - garbageValue = "1613117622" + signature = "(Ljc;Ljc;B)V", + garbageValue = "116" ) @Export("set") void set(Username var1, Username var2) { @@ -67,10 +67,10 @@ public class User implements Comparable { } } - @ObfuscatedName("v") + @ObfuscatedName("ay") @ObfuscatedSignature( - signature = "(Ljr;B)I", - garbageValue = "41" + signature = "(Ljy;S)I", + garbageValue = "9221" ) @Export("compareTo_user") public int compareTo_user(User var1) { @@ -83,19 +83,203 @@ public class User implements Comparable { @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(II)Lkc;", - garbageValue = "-1233621276" + signature = "([Ljava/lang/CharSequence;IIB)Ljava/lang/String;", + garbageValue = "69" ) - public static PrivateChatMode method5131(int var0) { - PrivateChatMode[] var1 = TileItemPile.method2810(); + public static String method5086(CharSequence[] var0, int var1, int var2) { + if (var2 == 0) { + return ""; + } else if (var2 == 1) { + CharSequence var3 = var0[var1]; + return var3 == null ? "null" : var3.toString(); + } else { + int var8 = var2 + var1; + int var4 = 0; - for (int var2 = 0; var2 < var1.length; ++var2) { - PrivateChatMode var3 = var1[var2]; - if (var0 == var3.field3795) { - return var3; + for (int var5 = var1; var5 < var8; ++var5) { + CharSequence var6 = var0[var5]; + if (var6 == null) { + var4 += 4; + } else { + var4 += var6.length(); + } } - } - return null; + StringBuilder var9 = new StringBuilder(var4); + + for (int var10 = var1; var10 < var8; ++var10) { + CharSequence var7 = var0[var10]; + if (var7 == null) { + var9.append("null"); + } else { + var9.append(var7); + } + } + + return var9.toString(); + } + } + + @ObfuscatedName("jx") + @ObfuscatedSignature( + signature = "(Lha;II)I", + garbageValue = "-548892292" + ) + static final int method5076(Widget var0, int var1) { + if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { + try { + int[] var2 = var0.cs1Instructions[var1]; + int var3 = 0; + int var4 = 0; + byte var5 = 0; + + while (true) { + int var6 = var2[var4++]; + int var7 = 0; + byte var8 = 0; + if (var6 == 0) { + return var3; + } + + if (var6 == 1) { + var7 = Client.currentLevels[var2[var4++]]; + } + + if (var6 == 2) { + var7 = Client.levels[var2[var4++]]; + } + + if (var6 == 3) { + var7 = Client.experience[var2[var4++]]; + } + + int var9; + Widget var10; + int var11; + int var12; + if (var6 == 4) { + var9 = var2[var4++] << 16; + var9 += var2[var4++]; + var10 = Tile.getWidget(var9); + var11 = var2[var4++]; + if (var11 != -1 && (!PacketBufferNode.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { + if (var11 + 1 == var10.itemIds[var12]) { + var7 += var10.itemQuantities[var12]; + } + } + } + } + + if (var6 == 5) { + var7 = Varps.Varps_main[var2[var4++]]; + } + + if (var6 == 6) { + var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1]; + } + + if (var6 == 7) { + var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875; + } + + if (var6 == 8) { + var7 = Message.localPlayer.combatLevel; + } + + if (var6 == 9) { + for (var9 = 0; var9 < 25; ++var9) { + if (Skills.Skills_enabled[var9]) { + var7 += Client.levels[var9]; + } + } + } + + if (var6 == 10) { + var9 = var2[var4++] << 16; + var9 += var2[var4++]; + var10 = Tile.getWidget(var9); + var11 = var2[var4++]; + if (var11 != -1 && (!PacketBufferNode.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { + if (var11 + 1 == var10.itemIds[var12]) { + var7 = 999999999; + break; + } + } + } + } + + if (var6 == 11) { + var7 = Client.runEnergy; + } + + if (var6 == 12) { + var7 = Client.weight; + } + + if (var6 == 13) { + var9 = Varps.Varps_main[var2[var4++]]; + int var13 = var2[var4++]; + var7 = (var9 & 1 << var13) != 0 ? 1 : 0; + } + + if (var6 == 14) { + var9 = var2[var4++]; + var7 = GameShell.getVarbit(var9); + } + + if (var6 == 15) { + var8 = 1; + } + + if (var6 == 16) { + var8 = 2; + } + + if (var6 == 17) { + var8 = 3; + } + + if (var6 == 18) { + var7 = MusicPatchPcmStream.baseX * 64 + (Message.localPlayer.x >> 7); + } + + if (var6 == 19) { + var7 = ScriptEvent.baseY * 64 + (Message.localPlayer.y >> 7); + } + + if (var6 == 20) { + var7 = var2[var4++]; + } + + if (var8 == 0) { + if (var5 == 0) { + var3 += var7; + } + + if (var5 == 1) { + var3 -= var7; + } + + if (var5 == 2 && var7 != 0) { + var3 /= var7; + } + + if (var5 == 3) { + var3 *= var7; + } + + var5 = 0; + } else { + var5 = var8; + } + } + } catch (Exception var14) { + return -1; + } + } else { + return -2; + } } } diff --git a/runescape-client/src/main/java/UserComparator1.java b/runescape-client/src/main/java/UserComparator1.java index 434d3b1a3b..654c84fcab 100644 --- a/runescape-client/src/main/java/UserComparator1.java +++ b/runescape-client/src/main/java/UserComparator1.java @@ -4,10 +4,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lu") +@ObfuscatedName("lf") @Implements("UserComparator1") public class UserComparator1 implements Comparator { - @ObfuscatedName("u") + @ObfuscatedName("b") + @Export("SpriteBuffer_spriteWidths") + public static int[] SpriteBuffer_spriteWidths; + @ObfuscatedName("f") @Export("reversed") final boolean reversed; @@ -15,10 +18,10 @@ public class UserComparator1 implements Comparator { this.reversed = var1; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Ljr;Ljr;I)I", - garbageValue = "-1890181365" + signature = "(Ljy;Ljy;B)I", + garbageValue = "67" ) @Export("compare_bridged") int compare_bridged(User var1, User var2) { diff --git a/runescape-client/src/main/java/UserComparator10.java b/runescape-client/src/main/java/UserComparator10.java index c05eaa001e..12c578a793 100644 --- a/runescape-client/src/main/java/UserComparator10.java +++ b/runescape-client/src/main/java/UserComparator10.java @@ -1,35 +1,20 @@ -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 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("ed") +@ObfuscatedName("eh") @Implements("UserComparator10") public class UserComparator10 extends AbstractUserComparator { - @ObfuscatedName("ss") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "Lbs;" + signature = "Lhz;" ) - @Export("clientPreferences") - static ClientPreferences clientPreferences; - @ObfuscatedName("st") - @ObfuscatedGetter( - intValue = -2089079301 - ) - @Export("foundItemIdCount") - static int foundItemIdCount; - @ObfuscatedName("u") + @Export("ItemDefinition_archive") + static AbstractArchive ItemDefinition_archive; + @ObfuscatedName("bm") + static String field1943; + @ObfuscatedName("f") @Export("reversed") final boolean reversed; @@ -37,10 +22,10 @@ public class UserComparator10 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Ljt;Ljt;S)I", - garbageValue = "-31573" + signature = "(Ljt;Ljt;B)I", + garbageValue = "-21" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -55,151 +40,45 @@ public class UserComparator10 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("b") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Lkj;B)V", - garbageValue = "-114" + signature = "(Lhz;I)V", + garbageValue = "-1966676528" ) - @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); + public static void method3335(AbstractArchive var0) { + InvDefinition.InvDefinition_archive = 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); - } + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "(Lhz;Lhz;I)V", + garbageValue = "-854242738" + ) + public static void method3336(AbstractArchive var0, AbstractArchive var1) { + HealthBarDefinition.HealthBarDefinition_archive = var0; + HealthBarDefinition.HitSplatDefinition_spritesArchive = var1; + } - 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); + @ObfuscatedName("gc") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "197475100" + ) + static final void method3337() { + for (GraphicsObject var0 = (GraphicsObject)Client.graphicsObjects.last(); var0 != null; var0 = (GraphicsObject)Client.graphicsObjects.previous()) { + if (var0.plane == UrlRequest.Client_plane && !var0.isFinished) { + if (Client.cycle >= var0.cycleStart) { + var0.advance(Client.field690); + if (var0.isFinished) { + var0.remove(); + } else { + class14.scene.drawEntity(var0.plane, var0.x, var0.y, var0.height, 60, var0, 0, -1L, false); } } - } - - var0.writeCrc(var2); - var1.remove(); - } - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "(Lbp;Lbp;IZB)I", - garbageValue = "12" - ) - @Export("compareWorlds") - static int compareWorlds(World var0, World var1, int var2, boolean var3) { - if (var2 == 1) { - int var4 = var0.population; - int var5 = var1.population; - if (!var3) { - if (var4 == -1) { - var4 = 2001; - } - - if (var5 == -1) { - var5 = 2001; - } - } - - return var4 - var5; - } else if (var2 == 2) { - return var0.location - var1.location; - } else if (var2 == 3) { - if (var0.activity.equals("-")) { - if (var1.activity.equals("-")) { - return 0; - } else { - return var3 ? -1 : 1; - } - } else if (var1.activity.equals("-")) { - return var3 ? 1 : -1; } else { - return var0.activity.compareTo(var1.activity); + var0.remove(); } - } else if (var2 == 4) { - return var0.method1785() ? (var1.method1785() ? 0 : 1) : (var1.method1785() ? -1 : 0); - } else if (var2 == 5) { - return var0.method1802() ? (var1.method1802() ? 0 : 1) : (var1.method1802() ? -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; } + } } diff --git a/runescape-client/src/main/java/UserComparator2.java b/runescape-client/src/main/java/UserComparator2.java index da39273a63..82bc09f938 100644 --- a/runescape-client/src/main/java/UserComparator2.java +++ b/runescape-client/src/main/java/UserComparator2.java @@ -1,17 +1,13 @@ -import java.io.File; import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lq") +@ObfuscatedName("lv") @Implements("UserComparator2") public class UserComparator2 implements Comparator { - @ObfuscatedName("z") - @Export("cacheDir") - public static File cacheDir; - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("reversed") final boolean reversed; @@ -19,21 +15,21 @@ public class UserComparator2 implements Comparator { this.reversed = var1; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Ljr;Ljr;I)I", - garbageValue = "-583410330" + signature = "(Ljy;Ljy;I)I", + garbageValue = "870914586" ) @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 4b0ea3027e..2f3d4be6e4 100644 --- a/runescape-client/src/main/java/UserComparator3.java +++ b/runescape-client/src/main/java/UserComparator3.java @@ -1,18 +1,12 @@ 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("fl") +@ObfuscatedName("ez") @Implements("UserComparator3") public class UserComparator3 extends AbstractUserComparator { - @ObfuscatedName("qg") - @ObfuscatedGetter( - intValue = -1789609461 - ) - static int field1990; - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("reversed") final boolean reversed; @@ -20,10 +14,10 @@ public class UserComparator3 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Ljt;Ljt;I)I", - garbageValue = "81177431" + signature = "(Ljt;Ljt;S)I", + garbageValue = "-14609" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -37,186 +31,4 @@ public class UserComparator3 extends AbstractUserComparator { public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(III)Lhl;", - garbageValue = "2096565459" - ) - @Export("getWidgetChild") - public static Widget getWidgetChild(int var0, int var1) { - Widget var2 = Language.getWidget(var0); - if (var1 == -1) { - return var2; - } else { - return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; - } - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "438202516" - ) - @Export("loadInterface") - public static boolean loadInterface(int var0) { - if (Widget.Widget_loadedInterfaces[var0]) { - return true; - } else if (!InvDefinition.Widget_archive.tryLoadGroup(var0)) { - return false; - } else { - int var1 = InvDefinition.Widget_archive.getGroupFileCount(var0); - if (var1 == 0) { - Widget.Widget_loadedInterfaces[var0] = true; - return true; - } else { - if (FloorDecoration.Widget_interfaceComponents[var0] == null) { - FloorDecoration.Widget_interfaceComponents[var0] = new Widget[var1]; - } - - for (int var2 = 0; var2 < var1; ++var2) { - if (FloorDecoration.Widget_interfaceComponents[var0][var2] == null) { - byte[] var3 = InvDefinition.Widget_archive.takeFile(var0, var2); - if (var3 != null) { - FloorDecoration.Widget_interfaceComponents[var0][var2] = new Widget(); - FloorDecoration.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); - if (var3[0] == -1) { - FloorDecoration.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); - } else { - FloorDecoration.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); - } - } - } - } - - Widget.Widget_loadedInterfaces[var0] = true; - return true; - } - } - } - - @ObfuscatedName("jl") - @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "-1508425976" - ) - static boolean method3476(int var0) { - for (int var1 = 0; var1 < Client.field889; ++var1) { - if (Client.field865[var1] == var0) { - return true; - } - } - - return false; - } - - @ObfuscatedName("jq") - @ObfuscatedSignature( - signature = "(Lhl;IIB)V", - garbageValue = "13" - ) - @Export("clickWidget") - static final void clickWidget(Widget var0, int var1, int var2) { - if (Client.clickedWidget == null && !Client.isMenuOpen) { - if (var0 != null) { - Widget var5 = var0; - int var7 = MenuAction.getWidgetClickMask(var0); - int var6 = var7 >> 17 & 7; - int var8 = var6; - Widget var4; - int var9; - if (var6 == 0) { - var4 = null; - } else { - var9 = 0; - - while (true) { - if (var9 >= var8) { - var4 = var5; - break; - } - - var5 = Language.getWidget(var5.parentId); - if (var5 == null) { - var4 = null; - break; - } - - ++var9; - } - } - - Widget var10 = var4; - if (var4 == null) { - var10 = var0.parent; - } - - if (var10 != null) { - Client.clickedWidget = var0; - var5 = var0; - var7 = MenuAction.getWidgetClickMask(var0); - var6 = var7 >> 17 & 7; - var8 = var6; - if (var6 == 0) { - var4 = null; - } else { - var9 = 0; - - while (true) { - if (var9 >= var8) { - var4 = var5; - break; - } - - var5 = Language.getWidget(var5.parentId); - if (var5 == null) { - var4 = null; - break; - } - - ++var9; - } - } - - var10 = var4; - if (var4 == null) { - var10 = var0.parent; - } - - Client.clickedWidgetParent = var10; - Client.widgetClickX = var1; - Client.widgetClickY = var2; - class3.widgetDragDuration = 0; - Client.isDraggingWidget = false; - int var11 = Client.menuOptionsCount - 1; - if (var11 != -1) { - Tiles.tempMenuAction = new MenuAction(); - Tiles.tempMenuAction.param0 = Client.menuArguments1[var11]; - Tiles.tempMenuAction.param1 = Client.menuArguments2[var11]; - Tiles.tempMenuAction.opcode = Client.menuOpcodes[var11]; - Tiles.tempMenuAction.identifier = Client.menuIdentifiers[var11]; - Tiles.tempMenuAction.action = Client.menuActions[var11]; - } - - return; - } - } - - } - } - - @ObfuscatedName("kr") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "65535" - ) - @Export("clanKickUser") - static final void clanKickUser(String var0) { - if (InterfaceParent.clanChat != null) { - PacketBufferNode var1 = ModelData0.getPacketBufferNode(ClientPacket.field2296, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(class173.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); - } - } } diff --git a/runescape-client/src/main/java/UserComparator4.java b/runescape-client/src/main/java/UserComparator4.java index f2a45008d8..bc6f03cf98 100644 --- a/runescape-client/src/main/java/UserComparator4.java +++ b/runescape-client/src/main/java/UserComparator4.java @@ -4,10 +4,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("en") +@ObfuscatedName("ei") @Implements("UserComparator4") public class UserComparator4 implements Comparator { - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("reversed") final boolean reversed; @@ -15,21 +15,21 @@ public class UserComparator4 implements Comparator { this.reversed = var1; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "(Ljt;Ljt;I)I", - garbageValue = "-955614748" + garbageValue = "-949245767" ) @Export("compare_bridged") int compare_bridged(Buddy var1, Buddy var2) { return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; } - public boolean equals(Object var1) { - return super.equals(var1); - } - public int compare(Object var1, Object var2) { return this.compare_bridged((Buddy)var1, (Buddy)var2); } + + public boolean equals(Object var1) { + return super.equals(var1); + } } diff --git a/runescape-client/src/main/java/UserComparator5.java b/runescape-client/src/main/java/UserComparator5.java index 10b42caa4d..274fd94b4b 100644 --- a/runescape-client/src/main/java/UserComparator5.java +++ b/runescape-client/src/main/java/UserComparator5.java @@ -3,10 +3,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fe") +@ObfuscatedName("ea") @Implements("UserComparator5") public class UserComparator5 extends AbstractUserComparator { - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("reversed") final boolean reversed; @@ -14,10 +14,10 @@ public class UserComparator5 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Ljt;Ljt;I)I", - garbageValue = "1252723685" + signature = "(Ljt;Ljt;B)I", + garbageValue = "-107" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -38,114 +38,636 @@ public class UserComparator5 extends AbstractUserComparator { @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Lhf;IIB)[Lln;", - garbageValue = "0" + signature = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", + garbageValue = "-1884137445" ) - @Export("SpriteBuffer_getSpriteArray") - public static Sprite[] SpriteBuffer_getSpriteArray(AbstractArchive var0, int var1, int var2) { - if (!GraphicsObject.method2030(var0, var1, var2)) { - return null; - } else { - Sprite[] var4 = new Sprite[class325.SpriteBuffer_spriteCount]; + public static String method3352(CharSequence var0) { + int var1 = var0.length(); + StringBuilder var2 = new StringBuilder(var1); - for (int var5 = 0; var5 < class325.SpriteBuffer_spriteCount; ++var5) { - Sprite var6 = var4[var5] = new Sprite(); - var6.width = class325.SpriteBuffer_spriteWidth; - var6.height = UserComparator9.SpriteBuffer_spriteHeight; - var6.xOffset = UrlRequester.SpriteBuffer_xOffsets[var5]; - var6.yOffset = class216.SpriteBuffer_yOffsets[var5]; - var6.subWidth = class325.SpriteBuffer_spriteWidths[var5]; - var6.subHeight = VarcInt.SpriteBuffer_spriteHeights[var5]; - int var7 = var6.subWidth * var6.subHeight; - byte[] var8 = FillMode.SpriteBuffer_pixels[var5]; - var6.pixels = new int[var7]; + for (int var3 = 0; var3 < var1; ++var3) { + char var4 = var0.charAt(var3); + if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') { + if (var4 == ' ') { + var2.append('+'); + } else { + byte var5 = NetSocket.charToByteCp1252(var4); + var2.append('%'); + int var6 = var5 >> 4 & 15; + if (var6 >= 10) { + var2.append((char)(var6 + 55)); + } else { + var2.append((char)(var6 + 48)); + } - for (int var9 = 0; var9 < var7; ++var9) { - var6.pixels[var9] = class325.SpriteBuffer_spritePalette[var8[var9] & 255]; + var6 = var5 & 15; + if (var6 >= 10) { + var2.append((char)(var6 + 55)); + } else { + var2.append((char)(var6 + 48)); + } } - } - - PcmPlayer.method2510(); - return var4; - } - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - signature = "([BIII)I", - garbageValue = "1975760321" - ) - public static int method3467(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]; - } - - var3 = ~var3; - return var3; - } - - @ObfuscatedName("fb") - @ObfuscatedSignature( - signature = "(Lbt;B)V", - garbageValue = "4" - ) - static final void method3461(Actor var0) { - int var1 = var0.field934 - Client.cycle; - int var2 = var0.field946 * 128 + var0.field938 * 64; - int var3 = var0.field979 * 128 + var0.field938 * 64; - var0.x += (var2 - var0.x) / var1; - var0.y += (var3 - var0.y) / var1; - var0.field976 = 0; - var0.orientation = var0.field983; - } - - @ObfuscatedName("ic") - @ObfuscatedSignature( - signature = "(ILjava/lang/String;I)V", - garbageValue = "-165860818" - ) - static void method3466(int var0, String var1) { - int var2 = Players.Players_count; - int[] var3 = Players.Players_indices; - boolean var4 = false; - Username var5 = new Username(var1, WorldMapLabelSize.loginType); - - for (int var6 = 0; var6 < var2; ++var6) { - Player var7 = Client.players[var3[var6]]; - if (var7 != null && var7 != class215.localPlayer && var7.username != null && var7.username.equals(var5)) { - PacketBufferNode var8; - if (var0 == 1) { - var8 = ModelData0.getPacketBufferNode(ClientPacket.field2231, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5598(0); - var8.packetBuffer.method5613(var3[var6]); - Client.packetWriter.addNode(var8); - } else if (var0 == 4) { - var8 = ModelData0.getPacketBufferNode(ClientPacket.field2267, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5613(var3[var6]); - var8.packetBuffer.writeByte(0); - Client.packetWriter.addNode(var8); - } else if (var0 == 6) { - var8 = ModelData0.getPacketBufferNode(ClientPacket.field2241, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5628(0); - var8.packetBuffer.method5636(var3[var6]); - Client.packetWriter.addNode(var8); - } else if (var0 == 7) { - var8 = ModelData0.getPacketBufferNode(ClientPacket.field2251, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(var3[var6]); - var8.packetBuffer.writeByte(0); - Client.packetWriter.addNode(var8); - } - - var4 = true; - break; + } else { + var2.append(var4); } } - if (!var4) { - GrandExchangeOfferAgeComparator.addGameMessage(4, "", "Unable to find " + var1); - } + return var2.toString(); + } + @ObfuscatedName("hu") + @ObfuscatedSignature( + signature = "(Lbv;IIIIIB)V", + garbageValue = "-1" + ) + @Export("drawActor2d") + static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { + if (var0 != null && var0.isVisible()) { + if (var0 instanceof NPC) { + NPCDefinition var6 = ((NPC)var0).definition; + if (var6.transforms != null) { + var6 = var6.transform(); + } + + if (var6 == null) { + return; + } + } + + int var75 = Players.Players_count; + int[] var7 = Players.Players_indices; + byte var8 = 0; + if (var1 < var75 && var0.playerCycle == Client.cycle && MouseHandler.method1073((Player)var0)) { + Player var9 = (Player)var0; + if (var1 < var75) { + class206.getActorScreenLocation(var0, var0.defaultHeight + 15); + AbstractFont var10 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); + byte var11 = 9; + var10.drawCentered(var9.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var11, 16777215, 0); + var8 = 18; + } + } + + int var76 = -2; + int var15; + int var22; + int var23; + if (!var0.healthBars.method4843()) { + class206.getActorScreenLocation(var0, var0.defaultHeight + 15); + + for (HealthBar var87 = (HealthBar)var0.healthBars.last(); var87 != null; var87 = (HealthBar)var0.healthBars.previous()) { + HealthBarUpdate var77 = var87.get(Client.cycle); + if (var77 == null) { + if (var87.isEmpty()) { + var87.remove(); + } + } else { + HealthBarDefinition var12 = var87.definition; + Sprite var13 = var12.getBackSprite(); + Sprite var14 = var12.getFrontSprite(); + int var16 = 0; + if (var13 != null && var14 != null) { + if (var12.widthPadding * 2 < var14.subWidth) { + var16 = var12.widthPadding; + } + + var15 = var14.subWidth - var16 * 2; + } else { + var15 = var12.width; + } + + int var17 = 255; + boolean var18 = true; + int var19 = Client.cycle - var77.cycle; + int var20 = var15 * var77.health2 / var12.width; + int var21; + int var92; + if (var77.cycleOffset > var19) { + var21 = var12.int4 == 0 ? 0 : var12.int4 * (var19 / var12.int4); + var22 = var15 * var77.health / var12.width; + var92 = var21 * (var20 - var22) / var77.cycleOffset + var22; + } else { + var92 = var20; + var21 = var12.int5 + var77.cycleOffset - var19; + if (var12.int3 >= 0) { + var17 = (var21 << 8) / (var12.int5 - var12.int3); + } + } + + if (var77.health2 > 0 && var92 < 1) { + var92 = 1; + } + + if (var13 != null && var14 != null) { + if (var92 == var15) { + var92 += var16 * 2; + } else { + var92 += var16; + } + + var21 = var13.subHeight; + var76 += var21; + var22 = var2 + Client.viewportTempX - (var15 >> 1); + var23 = var3 + Client.viewportTempY - var76; + var22 -= var16; + if (var17 >= 0 && var17 < 255) { + var13.drawTransAt(var22, var23, var17); + Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var92, var21 + var23); + var14.drawTransAt(var22, var23, var17); + } else { + var13.drawTransBgAt(var22, var23); + Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var92 + var22, var21 + var23); + var14.drawTransBgAt(var22, var23); + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); + var76 += 2; + } else { + var76 += 5; + if (Client.viewportTempX > -1) { + var21 = var2 + Client.viewportTempX - (var15 >> 1); + var22 = var3 + Client.viewportTempY - var76; + Rasterizer2D.Rasterizer2D_fillRectangle(var21, var22, var92, 5, 65280); + Rasterizer2D.Rasterizer2D_fillRectangle(var21 + var92, var22, var15 - var92, 5, 16711680); + } + + var76 += 2; + } + } + } + } + + if (var76 == -2) { + var76 += 7; + } + + var76 += var8; + if (var1 < var75) { + Player var88 = (Player)var0; + if (var88.isHidden) { + return; + } + + if (var88.headIconPk != -1 || var88.headIconPrayer != -1) { + class206.getActorScreenLocation(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + if (var88.headIconPk != -1) { + var76 += 25; + class222.headIconPkSprites[var88.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); + } + + if (var88.headIconPrayer != -1) { + var76 += 25; + GraphicsObject.headIconPrayerSprites[var88.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); + } + } + } + + if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { + class206.getActorScreenLocation(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + var76 += WorldMapData_0.headIconHintSprites[1].subHeight; + WorldMapData_0.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); + } + } + } else { + NPCDefinition var89 = ((NPC)var0).definition; + if (var89.transforms != null) { + var89 = var89.transform(); + } + + if (var89.headIconPrayer >= 0 && var89.headIconPrayer < GraphicsObject.headIconPrayerSprites.length) { + class206.getActorScreenLocation(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + GraphicsObject.headIconPrayerSprites[var89.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); + } + } + + if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { + class206.getActorScreenLocation(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + WorldMapData_0.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); + } + } + } + + if (var0.overheadText != null && (var1 >= var75 || !var0.field937 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { + class206.getActorScreenLocation(var0, var0.defaultHeight); + if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { + Client.overheadTextXOffsets[Client.overheadTextCount] = GrandExchangeOffer.fontBold12.stringWidth(var0.overheadText) / 2; + Client.overheadTextAscents[Client.overheadTextCount] = GrandExchangeOffer.fontBold12.ascent; + Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX; + Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY; + Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor; + Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect; + Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining; + Client.overheadText[Client.overheadTextCount] = var0.overheadText; + ++Client.overheadTextCount; + } + } + + for (int var78 = 0; var78 < 4; ++var78) { + int var90 = var0.hitSplatCycles[var78]; + int var79 = var0.hitSplatTypes[var78]; + HitSplatDefinition var91 = null; + int var80 = 0; + if (var79 >= 0) { + if (var90 <= Client.cycle) { + continue; + } + + var91 = MusicPatchNode.method3815(var0.hitSplatTypes[var78]); + var80 = var91.field3298; + if (var91 != null && var91.transforms != null) { + var91 = var91.transform(); + if (var91 == null) { + var0.hitSplatCycles[var78] = -1; + continue; + } + } + } else if (var90 < 0) { + continue; + } + + var15 = var0.hitSplatTypes2[var78]; + HitSplatDefinition var81 = null; + if (var15 >= 0) { + var81 = MusicPatchNode.method3815(var15); + if (var81 != null && var81.transforms != null) { + var81 = var81.transform(); + } + } + + if (var90 - var80 <= Client.cycle) { + if (var91 == null) { + var0.hitSplatCycles[var78] = -1; + } else { + class206.getActorScreenLocation(var0, var0.defaultHeight / 2); + if (Client.viewportTempX > -1) { + if (var78 == 1) { + Client.viewportTempY -= 20; + } + + if (var78 == 2) { + Client.viewportTempX -= 15; + Client.viewportTempY -= 10; + } + + if (var78 == 3) { + Client.viewportTempX += 15; + Client.viewportTempY -= 10; + } + + Sprite var82 = null; + Sprite var83 = null; + Sprite var84 = null; + Sprite var85 = null; + var22 = 0; + var23 = 0; + int var24 = 0; + int var25 = 0; + int var26 = 0; + int var27 = 0; + int var28 = 0; + int var29 = 0; + Sprite var30 = null; + Sprite var31 = null; + Sprite var32 = null; + Sprite var33 = null; + int var34 = 0; + int var35 = 0; + int var36 = 0; + int var37 = 0; + int var38 = 0; + int var39 = 0; + int var40 = 0; + int var41 = 0; + int var42 = 0; + var82 = var91.method4600(); + int var43; + if (var82 != null) { + var22 = var82.subWidth; + var43 = var82.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var26 = var82.xOffset; + } + + var83 = var91.method4576(); + if (var83 != null) { + var23 = var83.subWidth; + var43 = var83.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var27 = var83.xOffset; + } + + var84 = var91.method4587(); + if (var84 != null) { + var24 = var84.subWidth; + var43 = var84.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var28 = var84.xOffset; + } + + var85 = var91.method4596(); + if (var85 != null) { + var25 = var85.subWidth; + var43 = var85.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var29 = var85.xOffset; + } + + if (var81 != null) { + var30 = var81.method4600(); + if (var30 != null) { + var34 = var30.subWidth; + var43 = var30.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var38 = var30.xOffset; + } + + var31 = var81.method4576(); + if (var31 != null) { + var35 = var31.subWidth; + var43 = var31.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var39 = var31.xOffset; + } + + var32 = var81.method4587(); + if (var32 != null) { + var36 = var32.subWidth; + var43 = var32.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var40 = var32.xOffset; + } + + var33 = var81.method4596(); + if (var33 != null) { + var37 = var33.subWidth; + var43 = var33.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var41 = var33.xOffset; + } + } + + Font var86 = var91.getFont(); + if (var86 == null) { + var86 = class3.fontPlain11; + } + + Font var44; + if (var81 != null) { + var44 = var81.getFont(); + if (var44 == null) { + var44 = class3.fontPlain11; + } + } else { + var44 = class3.fontPlain11; + } + + String var45 = null; + String var46 = null; + boolean var47 = false; + int var48 = 0; + var45 = var91.getString(var0.hitSplatValues[var78]); + int var93 = var86.stringWidth(var45); + if (var81 != null) { + var46 = var81.getString(var0.hitSplatValues2[var78]); + var48 = var44.stringWidth(var46); + } + + int var49 = 0; + int var50 = 0; + if (var23 > 0) { + if (var84 == null && var85 == null) { + var49 = 1; + } else { + var49 = var93 / var23 + 1; + } + } + + if (var81 != null && var35 > 0) { + if (var32 == null && var33 == null) { + var50 = 1; + } else { + var50 = var48 / var35 + 1; + } + } + + int var51 = 0; + int var52 = var51; + if (var22 > 0) { + var51 += var22; + } + + var51 += 2; + int var53 = var51; + if (var24 > 0) { + var51 += var24; + } + + int var54 = var51; + int var55 = var51; + int var56; + if (var23 > 0) { + var56 = var49 * var23; + var51 += var56; + var55 += (var56 - var93) / 2; + } else { + var51 += var93; + } + + var56 = var51; + if (var25 > 0) { + var51 += var25; + } + + int var57 = 0; + int var58 = 0; + int var59 = 0; + int var60 = 0; + int var61 = 0; + int var62; + if (var81 != null) { + var51 += 2; + var57 = var51; + if (var34 > 0) { + var51 += var34; + } + + var51 += 2; + var58 = var51; + if (var36 > 0) { + var51 += var36; + } + + var59 = var51; + var61 = var51; + if (var35 > 0) { + var62 = var35 * var50; + var51 += var62; + var61 += (var62 - var48) / 2; + } else { + var51 += var48; + } + + var60 = var51; + if (var37 > 0) { + var51 += var37; + } + } + + var62 = var0.hitSplatCycles[var78] - Client.cycle; + int var63 = var91.field3303 - var62 * var91.field3303 / var91.field3298; + int var64 = var62 * var91.field3304 / var91.field3298 + -var91.field3304; + int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1)); + int var66 = var64 + (var3 + Client.viewportTempY - 12); + int var67 = var66; + int var68 = var66 + var42; + int var69 = var66 + var91.field3308 + 15; + int var70 = var69 - var86.maxAscent; + int var71 = var69 + var86.maxDescent; + if (var70 < var66) { + var67 = var70; + } + + if (var71 > var68) { + var68 = var71; + } + + int var72 = 0; + int var73; + int var74; + if (var81 != null) { + var72 = var66 + var81.field3308 + 15; + var73 = var72 - var44.maxAscent; + var74 = var72 + var44.maxDescent; + if (var73 < var67) { + ; + } + + if (var74 > var68) { + ; + } + } + + var73 = 255; + if (var91.field3305 >= 0) { + var73 = (var62 << 8) / (var91.field3298 - var91.field3305); + } + + if (var73 >= 0 && var73 < 255) { + if (var82 != null) { + var82.drawTransAt(var65 + var52 - var26, var66, var73); + } + + if (var84 != null) { + var84.drawTransAt(var53 + var65 - var28, var66, var73); + } + + if (var83 != null) { + for (var74 = 0; var74 < var49; ++var74) { + var83.drawTransAt(var23 * var74 + (var65 + var54 - var27), var66, var73); + } + } + + if (var85 != null) { + var85.drawTransAt(var56 + var65 - var29, var66, var73); + } + + var86.drawAlpha(var45, var65 + var55, var69, var91.textColor, 0, var73); + if (var81 != null) { + if (var30 != null) { + var30.drawTransAt(var57 + var65 - var38, var66, var73); + } + + if (var32 != null) { + var32.drawTransAt(var65 + var58 - var40, var66, var73); + } + + if (var31 != null) { + for (var74 = 0; var74 < var50; ++var74) { + var31.drawTransAt(var74 * var35 + (var59 + var65 - var39), var66, var73); + } + } + + if (var33 != null) { + var33.drawTransAt(var65 + var60 - var41, var66, var73); + } + + var44.drawAlpha(var46, var65 + var61, var72, var81.textColor, 0, var73); + } + } else { + if (var82 != null) { + var82.drawTransBgAt(var52 + var65 - var26, var66); + } + + if (var84 != null) { + var84.drawTransBgAt(var53 + var65 - var28, var66); + } + + if (var83 != null) { + for (var74 = 0; var74 < var49; ++var74) { + var83.drawTransBgAt(var74 * var23 + (var54 + var65 - var27), var66); + } + } + + if (var85 != null) { + var85.drawTransBgAt(var56 + var65 - var29, var66); + } + + var86.draw(var45, var55 + var65, var69, var91.textColor | -16777216, 0); + if (var81 != null) { + if (var30 != null) { + var30.drawTransBgAt(var57 + var65 - var38, var66); + } + + if (var32 != null) { + var32.drawTransBgAt(var65 + var58 - var40, var66); + } + + if (var31 != null) { + for (var74 = 0; var74 < var50; ++var74) { + var31.drawTransBgAt(var74 * var35 + (var59 + var65 - var39), var66); + } + } + + if (var33 != null) { + var33.drawTransBgAt(var60 + var65 - var41, var66); + } + + var44.draw(var46, var61 + var65, var72, var81.textColor | -16777216, 0); + } + } + } + } + } + } + + } } } diff --git a/runescape-client/src/main/java/UserComparator6.java b/runescape-client/src/main/java/UserComparator6.java index d31b3371b5..29cfb3aa15 100644 --- a/runescape-client/src/main/java/UserComparator6.java +++ b/runescape-client/src/main/java/UserComparator6.java @@ -2,11 +2,18 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("fv") +@ObfuscatedName("ey") @Implements("UserComparator6") public class UserComparator6 extends AbstractUserComparator { - @ObfuscatedName("u") + @ObfuscatedName("qy") + @ObfuscatedSignature( + signature = "Lcw;" + ) + @Export("pcmPlayer0") + static PcmPlayer pcmPlayer0; + @ObfuscatedName("f") @Export("reversed") final boolean reversed; @@ -14,10 +21,10 @@ public class UserComparator6 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Ljt;Ljt;B)I", - garbageValue = "-50" + signature = "(Ljt;Ljt;I)I", + garbageValue = "-226396145" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -32,58 +39,58 @@ public class UserComparator6 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("u") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lhf;III)Llm;", - garbageValue = "2030832414" + signature = "(CII)Ljava/lang/String;", + garbageValue = "953231357" ) - static IndexedSprite method3491(AbstractArchive var0, int var1, int var2) { - return !GraphicsObject.method2030(var0, var1, var2) ? null : GrandExchangeOfferAgeComparator.method172(); - } + public static String method3370(char var0, int var1) { + char[] var2 = new char[var1]; - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(Lkj;I)V", - garbageValue = "1502929201" - ) - @Export("updatePlayer") - static final void updatePlayer(PacketBuffer var0) { - var0.importIndex(); - int var1 = Client.localPlayerIndex; - Player var2 = class215.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 - class51.baseX * 64; - var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); - var2.pathY[0] = var6 - VarcInt.baseY * 64; - var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); - ClientPacket.Client_plane = var2.plane = var4; - if (Players.field1248[var1] != null) { - var2.read(Players.field1248[var1]); + for (int var3 = 0; var3 < var1; ++var3) { + var2[var3] = var0; } - Players.Players_count = 0; - Players.Players_indices[++Players.Players_count - 1] = var1; - Players.field1246[var1] = 0; - Players.Players_emptyIdxCount = 0; + return new String(var2); + } - 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.field1246[var7] = 0; + @ObfuscatedName("az") + @ObfuscatedSignature( + signature = "(ILcu;ZI)I", + garbageValue = "1830751012" + ) + static int method3369(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.GETWINDOWMODE) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = ItemDefinition.getWindowedMode(); + return 1; + } else { + int var3; + if (var0 == ScriptOpcodes.SETWINDOWMODE) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + if (var3 == 1 || var3 == 2) { + class60.setWindowedMode(var3); + } + + return 1; + } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Interpreter.clientPreferences.windowMode; + return 1; + } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { + if (var0 == 5310) { + --class188.Interpreter_intStackSize; + return 1; + } else { + return 2; + } + } else { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + if (var3 == 1 || var3 == 2) { + Interpreter.clientPreferences.windowMode = var3; + FriendSystem.savePreferences(); + } + + return 1; } } - - var0.exportIndex(); } } diff --git a/runescape-client/src/main/java/UserComparator7.java b/runescape-client/src/main/java/UserComparator7.java index 27f9022833..92842c9f5d 100644 --- a/runescape-client/src/main/java/UserComparator7.java +++ b/runescape-client/src/main/java/UserComparator7.java @@ -1,19 +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; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("eq") +@ObfuscatedName("eu") @Implements("UserComparator7") public class UserComparator7 extends AbstractUserComparator { - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = 1896521377 + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "[[Lha;" ) - @Export("musicTrackFileId") - public static int musicTrackFileId; - @ObfuscatedName("u") + @Export("Widget_interfaceComponents") + public static Widget[][] Widget_interfaceComponents; + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "Lha;" + ) + static Widget field1946; + @ObfuscatedName("f") @Export("reversed") final boolean reversed; @@ -21,10 +26,10 @@ public class UserComparator7 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Ljt;Ljt;I)I", - garbageValue = "2133624016" + signature = "(Ljt;Ljt;B)I", + garbageValue = "-30" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -38,4 +43,748 @@ public class UserComparator7 extends AbstractUserComparator { public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } + + @ObfuscatedName("b") + @ObfuscatedSignature( + signature = "([BIIIIIIILej;[Lfp;I)V", + garbageValue = "678267199" + ) + static final void method3344(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, Scene var8, CollisionMap[] var9) { + Buffer var10 = new Buffer(var0); + int var11 = -1; + + while (true) { + int var12 = var10.method5558(); + if (var12 == 0) { + return; + } + + var11 += var12; + int var13 = 0; + + while (true) { + int var14 = var10.readUShortSmart(); + if (var14 == 0) { + break; + } + + var13 += var14 - 1; + int var15 = var13 & 63; + int var16 = var13 >> 6 & 63; + int var17 = var13 >> 12; + int var18 = var10.readUnsignedByte(); + int var19 = var18 >> 2; + int var20 = var18 & 3; + if (var17 == var4 && var16 >= var5 && var16 < var5 + 8 && var15 >= var6 && var15 < var6 + 8) { + ObjectDefinition var21 = Coord.getObjectDefinition(var11); + int var24 = var16 & 7; + int var25 = var15 & 7; + int var27 = var21.sizeX; + int var28 = var21.sizeY; + int var29; + if ((var20 & 1) == 1) { + var29 = var27; + var27 = var28; + var28 = var29; + } + + int var26 = var7 & 3; + int var23; + if (var26 == 0) { + var23 = var24; + } else if (var26 == 1) { + var23 = var25; + } else if (var26 == 2) { + var23 = 7 - var24 - (var27 - 1); + } else { + var23 = 7 - var25 - (var28 - 1); + } + + var29 = var23 + var2; + int var32 = var16 & 7; + int var33 = var15 & 7; + int var35 = var21.sizeX; + int var36 = var21.sizeY; + int var37; + if ((var20 & 1) == 1) { + var37 = var35; + var35 = var36; + var36 = var37; + } + + int var34 = var7 & 3; + int var31; + if (var34 == 0) { + var31 = var33; + } else if (var34 == 1) { + var31 = 7 - var32 - (var35 - 1); + } else if (var34 == 2) { + var31 = 7 - var33 - (var36 - 1); + } else { + var31 = var32; + } + + var37 = var31 + var3; + if (var29 > 0 && var37 > 0 && var29 < 103 && var37 < 103) { + int var38 = var1; + if ((Tiles.Tiles_renderFlags[1][var29][var37] & 2) == 2) { + var38 = var1 - 1; + } + + CollisionMap var39 = null; + if (var38 >= 0) { + var39 = var9[var38]; + } + + VarbitDefinition.method4500(var1, var29, var37, var11, var20 + var7 & 3, var19, var8, var39); + } + } + } + } + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + signature = "(ILcu;ZI)I", + garbageValue = "2063896690" + ) + static int method3345(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.LOGOUT) { + Client.logoutTimer = 250; + return 1; + } else { + return 2; + } + } + + @ObfuscatedName("ib") + @ObfuscatedSignature( + signature = "([Lha;IIIIIIIII)V", + garbageValue = "-1693835764" + ) + @Export("drawInterface") + static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); + + for (int var9 = 0; var9 < var0.length; ++var9) { + Widget var10 = var0[var9]; + if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { + int var11; + if (var8 == -1) { + Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; + Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; + Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; + Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; + var11 = ++Client.rootWidgetCount - 1; + } else { + var11 = var8; + } + + var10.rootIndex = var11; + var10.cycle = Client.cycle; + if (!var10.isIf3 || !Varcs.isComponentHidden(var10)) { + if (var10.contentType > 0) { + SoundSystem.method2507(var10); + } + + int var12 = var10.x + var6; + int var13 = var7 + var10.y; + int var14 = var10.transparencyTop; + int var15; + int var16; + if (var10 == Client.clickedWidget) { + if (var1 != -1412584499 && !var10.isScrollBar) { + ClientPacket.field2223 = var0; + GrandExchangeEvents.field31 = var6; + class81.field1126 = var7; + continue; + } + + if (Client.isDraggingWidget && Client.field806) { + var15 = MouseHandler.MouseHandler_x; + var16 = MouseHandler.MouseHandler_y; + var15 -= Client.widgetClickX; + var16 -= Client.widgetClickY; + if (var15 < Client.field807) { + var15 = Client.field807; + } + + if (var15 + var10.width > Client.field807 + Client.clickedWidgetParent.width) { + var15 = Client.field807 + Client.clickedWidgetParent.width - var10.width; + } + + if (var16 < Client.field808) { + var16 = Client.field808; + } + + if (var16 + var10.height > Client.field808 + Client.clickedWidgetParent.height) { + var16 = Client.field808 + Client.clickedWidgetParent.height - var10.height; + } + + var12 = var15; + var13 = var16; + } + + if (!var10.isScrollBar) { + var14 = 128; + } + } + + int var17; + int var18; + int var20; + int var21; + int var22; + int var30; + if (var10.type == 2) { + var15 = var2; + var16 = var3; + var17 = var4; + var18 = var5; + } else if (var10.type == 9) { + var30 = var12; + var20 = var13; + var21 = var12 + var10.width; + var22 = var13 + var10.height; + if (var21 < var12) { + var30 = var21; + var21 = var12; + } + + if (var22 < var13) { + var20 = var22; + var22 = var13; + } + + ++var21; + ++var22; + var15 = var30 > var2 ? var30 : var2; + var16 = var20 > var3 ? var20 : var3; + var17 = var21 < var4 ? var21 : var4; + var18 = var22 < var5 ? var22 : var5; + } else { + var30 = var12 + var10.width; + var20 = var13 + var10.height; + var15 = var12 > var2 ? var12 : var2; + var16 = var13 > var3 ? var13 : var3; + var17 = var30 < var4 ? var30 : var4; + var18 = var20 < var5 ? var20 : var5; + } + + if (!var10.isIf3 || var15 < var17 && var16 < var18) { + if (var10.contentType != 0) { + if (var10.contentType == 1336) { + if (Client.displayFps) { + var13 += 15; + ScriptFrame.fontPlain12.drawRightAligned("Fps:" + GameShell.fps, var12 + var10.width, var13, 16776960, -1); + var13 += 15; + Runtime var38 = Runtime.getRuntime(); + var20 = (int)((var38.totalMemory() - var38.freeMemory()) / 1024L); + var21 = 16776960; + if (var20 > 327680 && !Client.isLowDetail) { + var21 = 16711680; + } + + ScriptFrame.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); + var13 += 15; + } + continue; + } + + if (var10.contentType == 1337) { + Client.viewportX = var12; + Client.viewportY = var13; + class192.drawEntities(var12, var13, var10.width, var10.height); + Client.field833[var10.rootIndex] = true; + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + continue; + } + + if (var10.contentType == 1338) { + Occluder.drawMinimap(var10, var12, var13, var11); + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + continue; + } + + if (var10.contentType == 1339) { + FriendSystem.drawCompass(var10, var12, var13, var11); + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + continue; + } + + if (var10.contentType == 1400) { + GrandExchangeEvent.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); + } + + if (var10.contentType == 1401) { + GrandExchangeEvent.worldMap.drawOverview(var12, var13, var10.width, var10.height); + } + + if (var10.contentType == 1402) { + StructDefinition.loginScreenRunesAnimation.draw(var12, Client.cycle); + } + } + + if (var10.type == 0) { + if (!var10.isIf3 && Varcs.isComponentHidden(var10) && var10 != class16.mousedOverWidgetIf1) { + continue; + } + + if (!var10.isIf3) { + if (var10.scrollY > var10.scrollHeight - var10.height) { + var10.scrollY = var10.scrollHeight - var10.height; + } + + if (var10.scrollY < 0) { + var10.scrollY = 0; + } + } + + drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); + if (var10.children != null) { + drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); + } + + InterfaceParent var19 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); + if (var19 != null) { + class13.drawWidgets(var19.group, var15, var16, var17, var18, var12, var13, var11); + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); + } + + if (Client.isResizable || Client.field835[var11] || Client.gameDrawingMode > 1) { + if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { + ClanMate.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); + } + + if (var10.type != 1) { + int var23; + int var24; + int var25; + int var26; + if (var10.type == 2) { + var30 = 0; + + for (var20 = 0; var20 < var10.rawHeight; ++var20) { + for (var21 = 0; var21 < var10.rawWidth; ++var21) { + var22 = var12 + var21 * (var10.paddingX + 32); + var23 = var13 + var20 * (var10.paddingY + 32); + if (var30 < 20) { + var22 += var10.inventoryXOffsets[var30]; + var23 += var10.inventoryYOffsets[var30]; + } + + if (var10.itemIds[var30] <= 0) { + if (var10.inventorySprites != null && var30 < 20) { + Sprite var45 = var10.getInventorySprite(var30); + if (var45 != null) { + var45.drawTransBgAt(var22, var23); + } else if (Widget.field2549) { + LoginPacket.invalidateWidget(var10); + } + } + } else { + boolean var39 = false; + boolean var40 = false; + var26 = var10.itemIds[var30] - 1; + if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == ClientPreferences.dragInventoryWidget && var30 == Client.dragItemSlotSource) { + Sprite var27; + if (Client.isItemSelected == 1 && var30 == KeyHandler.selectedItemSlot && var10.id == Occluder.selectedItemWidget) { + var27 = StudioGame.getItemSprite(var26, var10.itemQuantities[var30], 2, 0, 2, false); + } else { + var27 = StudioGame.getItemSprite(var26, var10.itemQuantities[var30], 1, 3153952, 2, false); + } + + if (var27 != null) { + if (var10 == ClientPreferences.dragInventoryWidget && var30 == Client.dragItemSlotSource) { + var24 = MouseHandler.MouseHandler_x - Client.field863; + var25 = MouseHandler.MouseHandler_y - Client.field738; + if (var24 < 5 && var24 > -5) { + var24 = 0; + } + + if (var25 < 5 && var25 > -5) { + var25 = 0; + } + + if (Client.itemDragDuration < 5) { + var24 = 0; + var25 = 0; + } + + var27.drawTransAt(var24 + var22, var25 + var23, 128); + if (var1 != -1) { + Widget var28 = var0[var1 & 65535]; + int var29; + if (var25 + var23 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { + var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field690 / 3; + if (var29 > Client.field690 * 10) { + var29 = Client.field690 * 10; + } + + if (var29 > var28.scrollY) { + var29 = var28.scrollY; + } + + var28.scrollY -= var29; + Client.field738 += var29; + LoginPacket.invalidateWidget(var28); + } + + if (var23 + var25 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { + var29 = (var25 + var23 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field690 / 3; + if (var29 > Client.field690 * 10) { + var29 = Client.field690 * 10; + } + + if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { + var29 = var28.scrollHeight - var28.height - var28.scrollY; + } + + var28.scrollY += var29; + Client.field738 -= var29; + LoginPacket.invalidateWidget(var28); + } + } + } else if (var10 == class192.field2372 && var30 == Client.field735) { + var27.drawTransAt(var22, var23, 128); + } else { + var27.drawTransBgAt(var22, var23); + } + } else { + LoginPacket.invalidateWidget(var10); + } + } + } + + ++var30; + } + } + } else if (var10.type == 3) { + if (WorldMapData_0.runCs1(var10)) { + var30 = var10.color2; + if (var10 == class16.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { + var30 = var10.mouseOverColor2; + } + } else { + var30 = var10.color; + if (var10 == class16.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { + var30 = var10.mouseOverColor; + } + } + + if (var10.fill) { + switch(var10.fillMode.value) { + case 1: + Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); + break; + case 2: + Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); + break; + default: + if (var14 == 0) { + Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var30); + } else { + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var30, 256 - (var14 & 255)); + } + } + } else if (var14 == 0) { + Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var30); + } else { + Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var30, 256 - (var14 & 255)); + } + } else { + Font var36; + if (var10.type == 4) { + var36 = var10.getFont(); + if (var36 == null) { + if (Widget.field2549) { + LoginPacket.invalidateWidget(var10); + } + } else { + String var43 = var10.text; + if (WorldMapData_0.runCs1(var10)) { + var20 = var10.color2; + if (var10 == class16.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { + var20 = var10.mouseOverColor2; + } + + if (var10.text2.length() > 0) { + var43 = var10.text2; + } + } else { + var20 = var10.color; + if (var10 == class16.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { + var20 = var10.mouseOverColor; + } + } + + if (var10.isIf3 && var10.itemId != -1) { + ItemDefinition var47 = PacketBufferNode.ItemDefinition_get(var10.itemId); + var43 = var47.name; + if (var43 == null) { + var43 = "null"; + } + + if ((var47.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { + var43 = NPC.colorStartTag(16748608) + var43 + "" + " " + 'x' + WorldMapSectionType.formatItemStacks(var10.itemQuantity); + } + } + + if (var10 == Client.meslayerContinueWidget) { + var43 = "Please wait..."; + var20 = var10.color; + } + + if (!var10.isIf3) { + var43 = class32.method553(var43, var10); + } + + var36.drawLines(var43, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); + } + } else if (var10.type == 5) { + Sprite var37; + if (!var10.isIf3) { + var37 = var10.getSprite(WorldMapData_0.runCs1(var10)); + if (var37 != null) { + var37.drawTransBgAt(var12, var13); + } else if (Widget.field2549) { + LoginPacket.invalidateWidget(var10); + } + } else { + if (var10.itemId != -1) { + var37 = StudioGame.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); + } else { + var37 = var10.getSprite(false); + } + + if (var37 == null) { + if (Widget.field2549) { + LoginPacket.invalidateWidget(var10); + } + } else { + var20 = var37.width; + var21 = var37.height; + if (!var10.spriteTiling) { + var22 = var10.width * 4096 / var20; + if (var10.spriteAngle != 0) { + var37.method6243(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); + } else if (var14 != 0) { + var37.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); + } else if (var20 == var10.width && var21 == var10.height) { + var37.drawTransBgAt(var12, var13); + } else { + var37.drawScaledAt(var12, var13, var10.width, var10.height); + } + } else { + Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); + var22 = (var20 - 1 + var10.width) / var20; + var23 = (var21 - 1 + var10.height) / var21; + + for (var24 = 0; var24 < var22; ++var24) { + for (var25 = 0; var25 < var23; ++var25) { + if (var10.spriteAngle != 0) { + var37.method6243(var20 / 2 + var12 + var24 * var20, var21 / 2 + var13 + var25 * var21, var10.spriteAngle, 4096); + } else if (var14 != 0) { + var37.drawTransAt(var12 + var24 * var20, var13 + var25 * var21, 256 - (var14 & 255)); + } else { + var37.drawTransBgAt(var12 + var20 * var24, var13 + var25 * var21); + } + } + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + } + } + } + } else { + ItemDefinition var32; + if (var10.type == 6) { + boolean var44 = WorldMapData_0.runCs1(var10); + if (var44) { + var20 = var10.sequenceId2; + } else { + var20 = var10.sequenceId; + } + + Model var41 = null; + var22 = 0; + if (var10.itemId != -1) { + var32 = PacketBufferNode.ItemDefinition_get(var10.itemId); + if (var32 != null) { + var32 = var32.getCountObj(var10.itemQuantity); + var41 = var32.getModel(1); + if (var41 != null) { + var41.calculateBoundsCylinder(); + var22 = var41.height / 2; + } else { + LoginPacket.invalidateWidget(var10); + } + } + } else if (var10.modelType == 5) { + if (var10.modelId == 0) { + var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); + } else { + var41 = Message.localPlayer.getModel(); + } + } else if (var20 == -1) { + var41 = var10.getModel((SequenceDefinition)null, -1, var44, Message.localPlayer.appearance); + if (var41 == null && Widget.field2549) { + LoginPacket.invalidateWidget(var10); + } + } else { + SequenceDefinition var46 = WorldMapSection0.SequenceDefinition_get(var20); + var41 = var10.getModel(var46, var10.modelFrame, var44, Message.localPlayer.appearance); + if (var41 == null && Widget.field2549) { + LoginPacket.invalidateWidget(var10); + } + } + + Rasterizer3D.method3086(var10.width / 2 + var12, var10.height / 2 + var13); + var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; + var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; + if (var41 != null) { + if (!var10.isIf3) { + var41.method2907(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); + } else { + var41.calculateBoundsCylinder(); + if (var10.modelOrthog) { + var41.method2905(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); + } else { + var41.method2907(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY); + } + } + } + + Rasterizer3D.Rasterizer3D_method3(); + } else { + if (var10.type == 7) { + var36 = var10.getFont(); + if (var36 == null) { + if (Widget.field2549) { + LoginPacket.invalidateWidget(var10); + } + continue; + } + + var20 = 0; + + for (var21 = 0; var21 < var10.rawHeight; ++var21) { + for (var22 = 0; var22 < var10.rawWidth; ++var22) { + if (var10.itemIds[var20] > 0) { + var32 = PacketBufferNode.ItemDefinition_get(var10.itemIds[var20] - 1); + String var33; + if (var32.isStackable != 1 && var10.itemQuantities[var20] == 1) { + var33 = NPC.colorStartTag(16748608) + var32.name + ""; + } else { + var33 = NPC.colorStartTag(16748608) + var32.name + "" + " " + 'x' + WorldMapSectionType.formatItemStacks(var10.itemQuantities[var20]); + } + + var25 = var12 + var22 * (var10.paddingX + 115); + var26 = var21 * (var10.paddingY + 12) + var13; + if (var10.textXAlignment == 0) { + var36.draw(var33, var25, var26, var10.color, var10.textShadowed ? 0 : -1); + } else if (var10.textXAlignment == 1) { + var36.drawCentered(var33, var10.width / 2 + var25, var26, var10.color, var10.textShadowed ? 0 : -1); + } else { + var36.drawRightAligned(var33, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1); + } + } + + ++var20; + } + } + } + + if (var10.type == 8 && var10 == class14.field90 && Client.field674 == Client.field798) { + var30 = 0; + var20 = 0; + Font var31 = ScriptFrame.fontPlain12; + String var34 = var10.text; + + String var42; + for (var34 = class32.method553(var34, var10); var34.length() > 0; var20 = var20 + var31.ascent + 1) { + var24 = var34.indexOf("
"); + if (var24 != -1) { + var42 = var34.substring(0, var24); + var34 = var34.substring(var24 + 4); + } else { + var42 = var34; + var34 = ""; + } + + var25 = var31.stringWidth(var42); + if (var25 > var30) { + var30 = var25; + } + } + + var30 += 6; + var20 += 7; + var24 = var12 + var10.width - 5 - var30; + var25 = var13 + var10.height + 5; + if (var24 < var12 + 5) { + var24 = var12 + 5; + } + + if (var24 + var30 > var4) { + var24 = var4 - var30; + } + + if (var20 + var25 > var5) { + var25 = var5 - var20; + } + + Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var30, var20, 16777120); + Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var30, var20, 0); + var34 = var10.text; + var26 = var25 + var31.ascent + 2; + + for (var34 = class32.method553(var34, var10); var34.length() > 0; var26 = var26 + var31.ascent + 1) { + int var35 = var34.indexOf("
"); + if (var35 != -1) { + var42 = var34.substring(0, var35); + var34 = var34.substring(var35 + 4); + } else { + var42 = var34; + var34 = ""; + } + + var31.draw(var42, var24 + 3, var26, 0, -1); + } + } + + if (var10.type == 9) { + if (var10.field2676) { + var30 = var12; + var20 = var13 + var10.height; + var21 = var12 + var10.width; + var22 = var13; + } else { + var30 = var12; + var20 = var13; + var21 = var12 + var10.width; + var22 = var13 + var10.height; + } + + if (var10.lineWid == 1) { + Rasterizer2D.Rasterizer2D_drawLine(var30, var20, var21, var22, var10.color); + } else { + DevicePcmPlayerProvider.method839(var30, var20, var21, var22, var10.color, var10.lineWid); + } + } + } + } + } + } + } + } + } + } + } + + } } diff --git a/runescape-client/src/main/java/UserComparator8.java b/runescape-client/src/main/java/UserComparator8.java index 1bababc293..c6992c7059 100644 --- a/runescape-client/src/main/java/UserComparator8.java +++ b/runescape-client/src/main/java/UserComparator8.java @@ -1,17 +1,24 @@ +import java.awt.Toolkit; +import java.awt.datatransfer.Clipboard; +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.Transferable; +import java.awt.datatransfer.UnsupportedFlavorException; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLConnection; +import java.util.Random; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("es") +@ObfuscatedName("ec") @Implements("UserComparator8") public class UserComparator8 extends AbstractUserComparator { - @ObfuscatedName("bd") - @ObfuscatedSignature( - signature = "Lhe;" - ) - static StudioGame field1973; - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("reversed") final boolean reversed; @@ -19,10 +26,10 @@ public class UserComparator8 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Ljt;Ljt;B)I", - garbageValue = "115" + signature = "(Ljt;Ljt;I)I", + garbageValue = "1853867406" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -41,69 +48,1073 @@ public class UserComparator8 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;IZB)I", - garbageValue = "69" + signature = "(I)[Liz;", + garbageValue = "1856442222" ) - @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(); + static HorizontalAlignment[] method3329() { + return new HorizontalAlignment[]{HorizontalAlignment.field3425, HorizontalAlignment.field3424, HorizontalAlignment.HorizontalAlignment_centered}; + } - 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; - } + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(II)Lim;", + garbageValue = "1724528275" + ) + @Export("VarpDefinition_get") + public static VarpDefinition VarpDefinition_get(int var0) { + VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; } else { - throw new IllegalArgumentException("" + 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 = "(Lbj;I)V", + garbageValue = "1646849936" + ) + @Export("doCycleTitle") + static void doCycleTitle(GameShell var0) { + if (Login.worldSelectOpen) { + class191.method3638(var0); + } else { + if ((MouseHandler.MouseHandler_lastButton == 1 || !NetFileRequest.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { + Interpreter.clientPreferences.titleMusicDisabled = !Interpreter.clientPreferences.titleMusicDisabled; + FriendSystem.savePreferences(); + if (!Interpreter.clientPreferences.titleMusicDisabled) { + Archive var1 = GrandExchangeOfferWorldComparator.archive6; + int var2 = var1.getGroupId("scape main"); + int var3 = var1.getFileId(var2, ""); + class173.playMusicTrack(var1, var2, var3, 255, false); + } else { + Actor.method1755(); + } + } + + if (Client.gameState != 5) { + if (Login.field1158 == -1L) { + Login.field1158 = WorldMapID.currentTimeMillis() + 1000L; + } + + long var33 = WorldMapID.currentTimeMillis(); + boolean var58; + if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { + while (true) { + if (Client.archiveLoadersDone >= Client.archiveLoaders.size()) { + var58 = true; + break; + } + + ArchiveLoader var4 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); + if (!var4.isLoaded()) { + var58 = false; + break; + } + + ++Client.archiveLoadersDone; + } + } else { + var58 = true; + } + + if (var58 && Login.field1187 == -1L) { + Login.field1187 = var33; + if (Login.field1187 > Login.field1158) { + Login.field1158 = Login.field1187; + } + } + + if (Client.gameState == 10 || Client.gameState == 11) { + int var35; + if (Language.Language_EN == Varps.clientLanguage) { + if (MouseHandler.MouseHandler_lastButton == 1 || !NetFileRequest.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { + var35 = Login.xPadding + 5; + short var5 = 463; + byte var6 = 100; + byte var7 = 35; + if (MouseHandler.MouseHandler_lastPressedX >= var35 && MouseHandler.MouseHandler_lastPressedX <= var6 + var35 && MouseHandler.MouseHandler_lastPressedY >= var5 && MouseHandler.MouseHandler_lastPressedY <= var7 + var5) { + class222.method4090(); + return; + } + } + + if (Login.World_request != null) { + class222.method4090(); + } + } + + var35 = MouseHandler.MouseHandler_lastButton; + int var59 = MouseHandler.MouseHandler_lastPressedX; + int var60 = MouseHandler.MouseHandler_lastPressedY; + if (var35 == 0) { + var59 = MouseHandler.MouseHandler_x; + var60 = MouseHandler.MouseHandler_y; + } + + if (!NetFileRequest.mouseCam && var35 == 4) { + var35 = 1; + } + + short var63; + int var64; + if (Login.loginIndex == 0) { + boolean var66 = false; + + while (KeyHandler.isKeyDown()) { + if (VertexNormal.field1732 == 84) { + var66 = true; + } + } + + var64 = Script.loginBoxCenter - 80; + var63 = 291; + if (var35 == 1 && var59 >= var64 - 75 && var59 <= var64 + 75 && var60 >= var63 - 20 && var60 <= var63 + 20) { + class13.openURL(NetFileRequest.method4121("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); + } + + var64 = Script.loginBoxCenter + 80; + if (var35 == 1 && var59 >= var64 - 75 && var59 <= var64 + 75 && var60 >= var63 - 20 && var60 <= var63 + 20 || var66) { + if ((Client.worldProperties & 33554432) != 0) { + Login.Login_response0 = ""; + Login.Login_response1 = "This is a Beta world."; + Login.Login_response2 = "Your normal account will not be affected."; + Login.Login_response3 = ""; + Login.loginIndex = 1; + WorldMapCacheName.method618(); + } else if ((Client.worldProperties & 4) != 0) { + if ((Client.worldProperties & 1024) != 0) { + Login.Login_response1 = "This is a High Risk PvP world."; + Login.Login_response2 = "Players can attack each other almost everywhere"; + Login.Login_response3 = "and the Protect Item prayer won't work."; + } else { + Login.Login_response1 = "This is a PvP world."; + Login.Login_response2 = "Players can attack each other"; + Login.Login_response3 = "almost everywhere."; + } + + Login.Login_response0 = "Warning!"; + Login.loginIndex = 1; + WorldMapCacheName.method618(); + } else if ((Client.worldProperties & 1024) != 0) { + Login.Login_response1 = "This is a High Risk world."; + Login.Login_response2 = "The Protect Item prayer will"; + Login.Login_response3 = "not work on this world."; + Login.Login_response0 = "Warning!"; + Login.loginIndex = 1; + WorldMapCacheName.method618(); + } else { + ItemDefinition.Login_promptCredentials(false); + } + } + } else { + short var8; + int var61; + if (Login.loginIndex == 1) { + while (true) { + if (!KeyHandler.isKeyDown()) { + var61 = Script.loginBoxCenter - 80; + var8 = 321; + if (var35 == 1 && var59 >= var61 - 75 && var59 <= var61 + 75 && var60 >= var8 - 20 && var60 <= var8 + 20) { + ItemDefinition.Login_promptCredentials(false); + } + + var61 = Script.loginBoxCenter + 80; + if (var35 == 1 && var59 >= var61 - 75 && var59 <= var61 + 75 && var60 >= var8 - 20 && var60 <= var8 + 20) { + Login.loginIndex = 0; + } + break; + } + + if (VertexNormal.field1732 == 84) { + ItemDefinition.Login_promptCredentials(false); + } else if (VertexNormal.field1732 == 13) { + Login.loginIndex = 0; + } + } + } else { + String var13; + short var62; + boolean var82; + if (Login.loginIndex == 2) { + var62 = 201; + var61 = var62 + 52; + if (var35 == 1 && var60 >= var61 - 12 && var60 < var61 + 2) { + Login.currentLoginField = 0; + } + + var61 += 15; + if (var35 == 1 && var60 >= var61 - 12 && var60 < var61 + 2) { + Login.currentLoginField = 1; + } + + var61 += 15; + var62 = 361; + if (class267.field3521 != null) { + var64 = class267.field3521.highX / 2; + if (var35 == 1 && var59 >= class267.field3521.lowX - var64 && var59 <= var64 + class267.field3521.lowX && var60 >= var62 - 15 && var60 < var62) { + switch(Login.field1181) { + case 1: + AbstractWorldMapData.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); + Login.loginIndex = 5; + return; + case 2: + class13.openURL("https://support.runescape.com/hc/en-gb", true, false); + } + } + } + + var64 = Script.loginBoxCenter - 80; + var63 = 321; + if (var35 == 1 && var59 >= var64 - 75 && var59 <= var64 + 75 && var60 >= var63 - 20 && var60 <= var63 + 20) { + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + AbstractWorldMapData.setLoginResponseString("", "Please enter your username/email address.", ""); + return; + } + + if (Login.Login_password.length() == 0) { + AbstractWorldMapData.setLoginResponseString("", "Please enter your password.", ""); + return; + } + + AbstractWorldMapData.setLoginResponseString("", "Connecting to server...", ""); + AbstractWorldMapIcon.method612(false); + class195.updateGameState(20); + return; + } + + var64 = Login.loginBoxX + 180 + 80; + if (var35 == 1 && var59 >= var64 - 75 && var59 <= var64 + 75 && var60 >= var63 - 20 && var60 <= var63 + 20) { + Login.loginIndex = 0; + Login.Login_username = ""; + Login.Login_password = ""; + class266.field3517 = 0; + class80.otp = ""; + Login.field1178 = true; + } + + var64 = Script.loginBoxCenter + -117; + var63 = 277; + Login.field1186 = var59 >= var64 && var59 < var64 + IgnoreList.field3579 && var60 >= var63 && var60 < var63 + MenuAction.field1133; + if (var35 == 1 && Login.field1186) { + Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; + if (!Client.Login_isUsernameRemembered && Interpreter.clientPreferences.rememberedUsername != null) { + Interpreter.clientPreferences.rememberedUsername = null; + FriendSystem.savePreferences(); + } + } + + var64 = Script.loginBoxCenter + 24; + var63 = 277; + Login.field1182 = var59 >= var64 && var59 < var64 + IgnoreList.field3579 && var60 >= var63 && var60 < var63 + MenuAction.field1133; + if (var35 == 1 && Login.field1182) { + Interpreter.clientPreferences.hideUsername = !Interpreter.clientPreferences.hideUsername; + if (!Interpreter.clientPreferences.hideUsername) { + Login.Login_username = ""; + Interpreter.clientPreferences.rememberedUsername = null; + WorldMapCacheName.method618(); + } + + FriendSystem.savePreferences(); + } + + while (true) { + Transferable var11; + int var67; + do { + while (true) { + label1185: + do { + while (true) { + while (KeyHandler.isKeyDown()) { + if (VertexNormal.field1732 != 13) { + if (Login.currentLoginField != 0) { + continue label1185; + } + + GrandExchangeEvents.method76(TileItemPile.field1521); + if (VertexNormal.field1732 == 85 && Login.Login_username.length() > 0) { + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (VertexNormal.field1732 == 84 || VertexNormal.field1732 == 80) { + Login.currentLoginField = 1; + } + + if (class227.method4102(TileItemPile.field1521) && Login.Login_username.length() < 320) { + Login.Login_username = Login.Login_username + TileItemPile.field1521; + } + } else { + Login.loginIndex = 0; + Login.Login_username = ""; + Login.Login_password = ""; + class266.field3517 = 0; + class80.otp = ""; + Login.field1178 = true; + } + } + + return; + } + } while(Login.currentLoginField != 1); + + if (VertexNormal.field1732 == 85 && Login.Login_password.length() > 0) { + Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); + } else if (VertexNormal.field1732 == 84 || VertexNormal.field1732 == 80) { + Login.currentLoginField = 0; + if (VertexNormal.field1732 == 84) { + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + AbstractWorldMapData.setLoginResponseString("", "Please enter your username/email address.", ""); + return; + } + + if (Login.Login_password.length() == 0) { + AbstractWorldMapData.setLoginResponseString("", "Please enter your password.", ""); + return; + } + + AbstractWorldMapData.setLoginResponseString("", "Connecting to server...", ""); + AbstractWorldMapIcon.method612(false); + class195.updateGameState(20); + return; + } + } + + if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && VertexNormal.field1732 == 67) { + Clipboard var10 = Toolkit.getDefaultToolkit().getSystemClipboard(); + var11 = var10.getContents(class206.client); + var67 = 20 - Login.Login_password.length(); + break; + } + + char var81 = TileItemPile.field1521; + if (var81 >= ' ' && var81 < 127 || var81 > 127 && var81 < 160 || var81 > 160 && var81 <= 255) { + var82 = true; + } else { + label1386: { + if (var81 != 0) { + char[] var38 = class287.cp1252AsciiExtension; + + for (int var39 = 0; var39 < var38.length; ++var39) { + char var69 = var38[var39]; + if (var69 == var81) { + var82 = true; + break label1386; + } + } + } + + var82 = false; + } + } + + if (var82 && class227.method4102(TileItemPile.field1521) && Login.Login_password.length() < 20) { + Login.Login_password = Login.Login_password + TileItemPile.field1521; + } + } + } while(var67 <= 0); + + try { + var13 = (String)var11.getTransferData(DataFlavor.stringFlavor); + int var71 = Math.min(var67, var13.length()); + + for (int var15 = 0; var15 < var71; ++var15) { + if (!class179.method3581(var13.charAt(var15)) || !class227.method4102(var13.charAt(var15))) { + Login.loginIndex = 3; + return; + } + } + + Login.Login_password = Login.Login_password + var13.substring(0, var71); + } catch (UnsupportedFlavorException var56) { + } catch (IOException var57) { + } + } + } else if (Login.loginIndex == 3) { + var61 = Login.loginBoxX + 180; + var8 = 276; + if (var35 == 1 && var59 >= var61 - 75 && var59 <= var61 + 75 && var60 >= var8 - 20 && var60 <= var8 + 20) { + ItemDefinition.Login_promptCredentials(false); + } + + var61 = Login.loginBoxX + 180; + var8 = 326; + if (var35 == 1 && var59 >= var61 - 75 && var59 <= var61 + 75 && var60 >= var8 - 20 && var60 <= var8 + 20) { + AbstractWorldMapData.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); + Login.loginIndex = 5; + return; + } + } else { + int var37; + if (Login.loginIndex == 4) { + var61 = Login.loginBoxX + 180 - 80; + var8 = 321; + if (var35 == 1 && var59 >= var61 - 75 && var59 <= var61 + 75 && var60 >= var8 - 20 && var60 <= var8 + 20) { + class80.otp.trim(); + if (class80.otp.length() != 6) { + AbstractWorldMapData.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); + return; + } + + class266.field3517 = Integer.parseInt(class80.otp); + class80.otp = ""; + AbstractWorldMapIcon.method612(true); + AbstractWorldMapData.setLoginResponseString("", "Connecting to server...", ""); + class195.updateGameState(20); + return; + } + + if (var35 == 1 && var59 >= Login.loginBoxX + 180 - 9 && var59 <= Login.loginBoxX + 180 + 130 && var60 >= 263 && var60 <= 296) { + Login.field1178 = !Login.field1178; + } + + if (var35 == 1 && var59 >= Login.loginBoxX + 180 - 34 && var59 <= Login.loginBoxX + 34 + 180 && var60 >= 351 && var60 <= 363) { + class13.openURL(NetFileRequest.method4121("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); + } + + var61 = Login.loginBoxX + 180 + 80; + if (var35 == 1 && var59 >= var61 - 75 && var59 <= var61 + 75 && var60 >= var8 - 20 && var60 <= var8 + 20) { + Login.loginIndex = 0; + Login.Login_username = ""; + Login.Login_password = ""; + class266.field3517 = 0; + class80.otp = ""; + } + + while (KeyHandler.isKeyDown()) { + boolean var9 = false; + + for (var37 = 0; var37 < "1234567890".length(); ++var37) { + if (TileItemPile.field1521 == "1234567890".charAt(var37)) { + var9 = true; + break; + } + } + + if (VertexNormal.field1732 == 13) { + Login.loginIndex = 0; + Login.Login_username = ""; + Login.Login_password = ""; + class266.field3517 = 0; + class80.otp = ""; + } else { + if (VertexNormal.field1732 == 85 && class80.otp.length() > 0) { + class80.otp = class80.otp.substring(0, class80.otp.length() - 1); + } + + if (VertexNormal.field1732 == 84) { + class80.otp.trim(); + if (class80.otp.length() != 6) { + AbstractWorldMapData.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); + return; + } + + class266.field3517 = Integer.parseInt(class80.otp); + class80.otp = ""; + AbstractWorldMapIcon.method612(true); + AbstractWorldMapData.setLoginResponseString("", "Connecting to server...", ""); + class195.updateGameState(20); + return; + } + + if (var9 && class80.otp.length() < 6) { + class80.otp = class80.otp + TileItemPile.field1521; + } + } + } + } else if (Login.loginIndex == 5) { + var61 = Login.loginBoxX + 180 - 80; + var8 = 321; + String var23; + if (var35 == 1 && var59 >= var61 - 75 && var59 <= var61 + 75 && var60 >= var8 - 20 && var60 <= var8 + 20) { + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + AbstractWorldMapData.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); + } else { + long var40 = ArchiveLoader.method1156(); + byte var65; + if (var40 == 0L) { + var65 = 5; + } else { + var13 = Login.Login_username; + Random var42 = new Random(); + Buffer var83 = new Buffer(128); + Buffer var68 = new Buffer(128); + int[] var70 = new int[]{var42.nextInt(), var42.nextInt(), (int)(var40 >> 32), (int)var40}; + var83.writeByte(10); + + int var18; + for (var18 = 0; var18 < 4; ++var18) { + var83.writeInt(var42.nextInt()); + } + + var83.writeInt(var70[0]); + var83.writeInt(var70[1]); + var83.writeLong(var40); + var83.writeLong(0L); + + for (var18 = 0; var18 < 4; ++var18) { + var83.writeInt(var42.nextInt()); + } + + var83.encryptRsa(class80.field1109, class80.field1112); + var68.writeByte(10); + + for (var18 = 0; var18 < 3; ++var18) { + var68.writeInt(var42.nextInt()); + } + + var68.writeLong(var42.nextLong()); + var68.writeLongMedium(var42.nextLong()); + if (Client.randomDatData != null) { + var68.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); + } else { + byte[] var84 = MenuAction.method2068(); + var68.writeBytes(var84, 0, var84.length); + } + + var68.writeLong(var42.nextLong()); + var68.encryptRsa(class80.field1109, class80.field1112); + var18 = ViewportMouse.stringCp1252NullTerminatedByteSize(var13); + if (var18 % 8 != 0) { + var18 += 8 - var18 % 8; + } + + Buffer var72 = new Buffer(var18); + var72.writeStringCp1252NullTerminated(var13); + var72.offset = var18; + var72.xteaEncryptAll(var70); + Buffer var73 = new Buffer(var72.offset + var68.offset + var83.offset + 5); + var73.writeByte(2); + var73.writeByte(var83.offset); + var73.writeBytes(var83.array, 0, var83.offset); + var73.writeByte(var68.offset); + var73.writeBytes(var68.array, 0, var68.offset); + var73.writeShort(var72.offset); + var73.writeBytes(var72.array, 0, var72.offset); + byte[] var75 = var73.array; + String var74 = Language.method3636(var75, 0, var75.length); + var23 = var74; + + byte var12; + try { + URL var76 = new URL(NetFileRequest.method4121("services", false) + "m=accountappeal/login.ws"); + URLConnection var77 = var76.openConnection(); + var77.setDoInput(true); + var77.setDoOutput(true); + var77.setConnectTimeout(5000); + OutputStreamWriter var78 = new OutputStreamWriter(var77.getOutputStream()); + var78.write("data2=" + UserComparator5.method3352(var23) + "&dest=" + UserComparator5.method3352("passwordchoice.ws")); + var78.flush(); + InputStream var79 = var77.getInputStream(); + var73 = new Buffer(new byte[1000]); + + while (true) { + int var28 = var79.read(var73.array, var73.offset, 1000 - var73.offset); + if (var28 == -1) { + var78.close(); + var79.close(); + String var85 = new String(var73.array); + if (var85.startsWith("OFFLINE")) { + var12 = 4; + } else if (var85.startsWith("WRONG")) { + var12 = 7; + } else if (var85.startsWith("RELOAD")) { + var12 = 3; + } else if (var85.startsWith("Not permitted for social network accounts.")) { + var12 = 6; + } else { + var73.xteaDecryptAll(var70); + + while (var73.offset > 0 && var73.array[var73.offset - 1] == 0) { + --var73.offset; + } + + var85 = new String(var73.array, 0, var73.offset); + boolean var29; + if (var85 == null) { + var29 = false; + } else { + label1361: { + try { + new URL(var85); + } catch (MalformedURLException var52) { + var29 = false; + break label1361; + } + + var29 = true; + } + } + + if (var29) { + class13.openURL(var85, true, false); + var12 = 2; + } else { + var12 = 5; + } + } + break; + } + + var73.offset += var28; + if (var73.offset >= 1000) { + var12 = 5; + break; + } + } + } catch (Throwable var53) { + var53.printStackTrace(); + var12 = 5; + } + + var65 = var12; + } + + switch(var65) { + case 2: + AbstractWorldMapData.setLoginResponseString(Strings.field2834, Strings.field3014, Strings.field3015); + Login.loginIndex = 6; + break; + case 3: + AbstractWorldMapData.setLoginResponseString("", "Error connecting to server.", ""); + break; + case 4: + AbstractWorldMapData.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); + break; + case 5: + AbstractWorldMapData.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); + break; + case 6: + AbstractWorldMapData.setLoginResponseString("", "Error connecting to server.", ""); + break; + case 7: + AbstractWorldMapData.setLoginResponseString("You must enter a valid login to proceed. For accounts", "created after 24th November 2010, please use your", "email address. Otherwise please use your username."); + } + } + + return; + } + + var61 = Login.loginBoxX + 180 + 80; + if (var35 == 1 && var59 >= var61 - 75 && var59 <= var61 + 75 && var60 >= var8 - 20 && var60 <= var8 + 20) { + ItemDefinition.Login_promptCredentials(true); + } + + var63 = 361; + if (class197.field2397 != null) { + var37 = class197.field2397.highX / 2; + if (var35 == 1 && var59 >= class197.field2397.lowX - var37 && var59 <= var37 + class197.field2397.lowX && var60 >= var63 - 15 && var60 < var63) { + class13.openURL(NetFileRequest.method4121("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); + } + } + + while (KeyHandler.isKeyDown()) { + var82 = false; + + for (int var36 = 0; var36 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var36) { + if (TileItemPile.field1521 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var36)) { + var82 = true; + break; + } + } + + if (VertexNormal.field1732 == 13) { + ItemDefinition.Login_promptCredentials(true); + } else { + if (VertexNormal.field1732 == 85 && Login.Login_username.length() > 0) { + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (VertexNormal.field1732 == 84) { + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + AbstractWorldMapData.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); + } else { + long var46 = ArchiveLoader.method1156(); + byte var80; + if (var46 == 0L) { + var80 = 5; + } else { + String var43 = Login.Login_username; + Random var16 = new Random(); + Buffer var17 = new Buffer(128); + Buffer var44 = new Buffer(128); + int[] var19 = new int[]{var16.nextInt(), var16.nextInt(), (int)(var46 >> 32), (int)var46}; + var17.writeByte(10); + + int var48; + for (var48 = 0; var48 < 4; ++var48) { + var17.writeInt(var16.nextInt()); + } + + var17.writeInt(var19[0]); + var17.writeInt(var19[1]); + var17.writeLong(var46); + var17.writeLong(0L); + + for (var48 = 0; var48 < 4; ++var48) { + var17.writeInt(var16.nextInt()); + } + + var17.encryptRsa(class80.field1109, class80.field1112); + var44.writeByte(10); + + for (var48 = 0; var48 < 3; ++var48) { + var44.writeInt(var16.nextInt()); + } + + var44.writeLong(var16.nextLong()); + var44.writeLongMedium(var16.nextLong()); + if (Client.randomDatData != null) { + var44.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); + } else { + byte[] var20 = MenuAction.method2068(); + var44.writeBytes(var20, 0, var20.length); + } + + var44.writeLong(var16.nextLong()); + var44.encryptRsa(class80.field1109, class80.field1112); + var48 = ViewportMouse.stringCp1252NullTerminatedByteSize(var43); + if (var48 % 8 != 0) { + var48 += 8 - var48 % 8; + } + + Buffer var21 = new Buffer(var48); + var21.writeStringCp1252NullTerminated(var43); + var21.offset = var48; + var21.xteaEncryptAll(var19); + Buffer var22 = new Buffer(var21.offset + var44.offset + var17.offset + 5); + var22.writeByte(2); + var22.writeByte(var17.offset); + var22.writeBytes(var17.array, 0, var17.offset); + var22.writeByte(var44.offset); + var22.writeBytes(var44.array, 0, var44.offset); + var22.writeShort(var21.offset); + var22.writeBytes(var21.array, 0, var21.offset); + byte[] var24 = var22.array; + var23 = Language.method3636(var24, 0, var24.length); + String var25 = var23; + + byte var14; + try { + URL var26 = new URL(NetFileRequest.method4121("services", false) + "m=accountappeal/login.ws"); + URLConnection var27 = var26.openConnection(); + var27.setDoInput(true); + var27.setDoOutput(true); + var27.setConnectTimeout(5000); + OutputStreamWriter var45 = new OutputStreamWriter(var27.getOutputStream()); + var45.write("data2=" + UserComparator5.method3352(var25) + "&dest=" + UserComparator5.method3352("passwordchoice.ws")); + var45.flush(); + InputStream var49 = var27.getInputStream(); + var22 = new Buffer(new byte[1000]); + + while (true) { + int var50 = var49.read(var22.array, var22.offset, 1000 - var22.offset); + if (var50 == -1) { + var45.close(); + var49.close(); + String var30 = new String(var22.array); + if (var30.startsWith("OFFLINE")) { + var14 = 4; + } else if (var30.startsWith("WRONG")) { + var14 = 7; + } else if (var30.startsWith("RELOAD")) { + var14 = 3; + } else if (var30.startsWith("Not permitted for social network accounts.")) { + var14 = 6; + } else { + var22.xteaDecryptAll(var19); + + while (var22.offset > 0 && var22.array[var22.offset - 1] == 0) { + --var22.offset; + } + + var30 = new String(var22.array, 0, var22.offset); + boolean var31; + if (var30 == null) { + var31 = false; + } else { + label1363: { + try { + new URL(var30); + } catch (MalformedURLException var54) { + var31 = false; + break label1363; + } + + var31 = true; + } + } + + if (var31) { + class13.openURL(var30, true, false); + var14 = 2; + } else { + var14 = 5; + } + } + break; + } + + var22.offset += var50; + if (var22.offset >= 1000) { + var14 = 5; + break; + } + } + } catch (Throwable var55) { + var55.printStackTrace(); + var14 = 5; + } + + var80 = var14; + } + + switch(var80) { + case 2: + AbstractWorldMapData.setLoginResponseString(Strings.field2834, Strings.field3014, Strings.field3015); + Login.loginIndex = 6; + break; + case 3: + AbstractWorldMapData.setLoginResponseString("", "Error connecting to server.", ""); + break; + case 4: + AbstractWorldMapData.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); + break; + case 5: + AbstractWorldMapData.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); + break; + case 6: + AbstractWorldMapData.setLoginResponseString("", "Error connecting to server.", ""); + break; + case 7: + AbstractWorldMapData.setLoginResponseString("You must enter a valid login to proceed. For accounts", "created after 24th November 2010, please use your", "email address. Otherwise please use your username."); + } + } + + return; + } + + if (var82 && Login.Login_username.length() < 320) { + Login.Login_username = Login.Login_username + TileItemPile.field1521; + } + } + } + } else if (Login.loginIndex != 6) { + if (Login.loginIndex == 7) { + var61 = Login.loginBoxX + 180 - 80; + var8 = 321; + if (var35 == 1 && var59 >= var61 - 75 && var59 <= var61 + 75 && var60 >= var8 - 20 && var60 <= var8 + 20) { + class13.openURL(NetFileRequest.method4121("secure", true) + "m=dob/set_dob.ws", true, false); + AbstractWorldMapData.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); + Login.loginIndex = 6; + return; + } + + var61 = Login.loginBoxX + 180 + 80; + if (var35 == 1 && var59 >= var61 - 75 && var59 <= var61 + 75 && var60 >= var8 - 20 && var60 <= var8 + 20) { + ItemDefinition.Login_promptCredentials(true); + } + } else if (Login.loginIndex == 8) { + var61 = Login.loginBoxX + 180 - 80; + var8 = 321; + if (var35 == 1 && var59 >= var61 - 75 && var59 <= var61 + 75 && var60 >= var8 - 20 && var60 <= var8 + 20) { + class13.openURL("https://www.jagex.com/terms/privacy/#eight", true, false); + AbstractWorldMapData.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); + Login.loginIndex = 6; + return; + } + + var61 = Login.loginBoxX + 180 + 80; + if (var35 == 1 && var59 >= var61 - 75 && var59 <= var61 + 75 && var60 >= var8 - 20 && var60 <= var8 + 20) { + ItemDefinition.Login_promptCredentials(true); + } + } else if (Login.loginIndex == 12) { + String var51 = ""; + switch(Login.field1167) { + case 0: + var51 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; + break; + case 1: + var51 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; + break; + default: + ItemDefinition.Login_promptCredentials(false); + } + + var64 = Login.loginBoxX + 180; + var63 = 276; + if (var35 == 1 && var59 >= var64 - 75 && var59 <= var64 + 75 && var60 >= var63 - 20 && var60 <= var63 + 20) { + class13.openURL(var51, true, false); + AbstractWorldMapData.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); + Login.loginIndex = 6; + return; + } + + var64 = Login.loginBoxX + 180; + var63 = 326; + if (var35 == 1 && var59 >= var64 - 75 && var59 <= var64 + 75 && var60 >= var63 - 20 && var60 <= var63 + 20) { + ItemDefinition.Login_promptCredentials(false); + } + } else if (Login.loginIndex == 24) { + var61 = Login.loginBoxX + 180; + var8 = 301; + if (var35 == 1 && var59 >= var61 - 75 && var59 <= var61 + 75 && var60 >= var8 - 20 && var60 <= var8 + 20) { + ItemDefinition.Login_promptCredentials(false); + } + } + } else { + while (true) { + do { + if (!KeyHandler.isKeyDown()) { + var62 = 321; + if (var35 == 1 && var60 >= var62 - 20 && var60 <= var62 + 20) { + ItemDefinition.Login_promptCredentials(true); + } + + return; + } + } while(VertexNormal.field1732 != 84 && VertexNormal.field1732 != 13); + + ItemDefinition.Login_promptCredentials(true); + } + } + } + } + } + + } + } + } + } + + @ObfuscatedName("hb") + @ObfuscatedSignature( + signature = "(IIZS)V", + garbageValue = "16128" + ) + static final void method3327(int var0, int var1, boolean var2) { + if (!var2 || var0 != GrandExchangeOfferTotalQuantityComparator.field47 || ClanMate.field3567 != var1) { + GrandExchangeOfferTotalQuantityComparator.field47 = var0; + ClanMate.field3567 = var1; + class195.updateGameState(25); + class1.drawLoadingMessage("Loading - please wait.", true); + int var3 = MusicPatchPcmStream.baseX * 64; + int var4 = ScriptEvent.baseY * 64; + MusicPatchPcmStream.baseX = (var0 - 6) * 8; + ScriptEvent.baseY = (var1 - 6) * 8; + int var5 = MusicPatchPcmStream.baseX * 64 - var3; + int var6 = ScriptEvent.baseY * 64 - var4; + var3 = MusicPatchPcmStream.baseX * 64; + var4 = ScriptEvent.baseY * 64; + + int var7; + int var9; + int[] var10000; + for (var7 = 0; var7 < 32768; ++var7) { + NPC var8 = Client.npcs[var7]; + if (var8 != null) { + for (var9 = 0; var9 < 10; ++var9) { + var10000 = var8.pathX; + var10000[var9] -= var5; + var10000 = var8.pathY; + var10000[var9] -= var6; + } + + var8.x -= var5 * 128; + var8.y -= var6 * 128; + } + } + + for (var7 = 0; var7 < 2048; ++var7) { + Player var21 = Client.players[var7]; + if (var21 != null) { + for (var9 = 0; var9 < 10; ++var9) { + var10000 = var21.pathX; + var10000[var9] -= var5; + var10000 = var21.pathY; + var10000[var9] -= var6; + } + + var21.x -= var5 * 128; + var21.y -= var6 * 128; + } + } + + byte var20 = 0; + byte var18 = 104; + byte var22 = 1; + if (var5 < 0) { + var20 = 103; + var18 = -1; + var22 = -1; + } + + byte var10 = 0; + byte var11 = 104; + byte var12 = 1; + if (var6 < 0) { + var10 = 103; + var11 = -1; + var12 = -1; + } + + int var14; + for (int var13 = var20; var18 != var13; var13 += var22) { + for (var14 = var10; var14 != var11; var14 += var12) { + int var15 = var13 + var5; + int var16 = var6 + var14; + + for (int var17 = 0; var17 < 4; ++var17) { + if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { + Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; + } else { + Client.groundItems[var17][var13][var14] = null; + } + } + } + } + + for (PendingSpawn var19 = (PendingSpawn)Client.pendingSpawns.last(); var19 != null; var19 = (PendingSpawn)Client.pendingSpawns.previous()) { + var19.x -= var5; + var19.y -= var6; + if (var19.x < 0 || var19.y < 0 || var19.x >= 104 || var19.y >= 104) { + var19.remove(); + } + } + + if (Client.destinationX != 0) { + Client.destinationX -= var5; + Client.destinationY -= var6; + } + + Client.soundEffectCount = 0; + Client.isCameraLocked = false; + MusicPatchNode2.cameraX -= var5 << 7; + UserComparator9.cameraZ -= var6 << 7; + WorldMapSectionType.oculusOrbFocalPointX -= var5 << 7; + Language.oculusOrbFocalPointY -= var6 << 7; + Client.field853 = -1; + Client.graphicsObjects.clear(); + Client.projectiles.clear(); + + for (var14 = 0; var14 < 4; ++var14) { + Client.collisionMaps[var14].clear(); + } + } } } diff --git a/runescape-client/src/main/java/UserComparator9.java b/runescape-client/src/main/java/UserComparator9.java index face8252b5..2d1da039b1 100644 --- a/runescape-client/src/main/java/UserComparator9.java +++ b/runescape-client/src/main/java/UserComparator9.java @@ -1,30 +1,25 @@ -import java.io.IOException; -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("eb") +@ObfuscatedName("eg") @Implements("UserComparator9") public class UserComparator9 extends AbstractUserComparator { - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = -614413985 - ) - @Export("SpriteBuffer_spriteHeight") - static int SpriteBuffer_spriteHeight; - @ObfuscatedName("al") - @Export("garbageCollector") - static GarbageCollectorMXBean garbageCollector; - @ObfuscatedName("dy") + @ObfuscatedName("et") @ObfuscatedSignature( - signature = "Lij;" + signature = "Lif;" ) - @Export("archive18") - static Archive archive18; - @ObfuscatedName("u") + @Export("archive20") + static Archive archive20; + @ObfuscatedName("hg") + @ObfuscatedGetter( + intValue = -864409125 + ) + @Export("cameraZ") + static int cameraZ; + @ObfuscatedName("f") @Export("reversed") final boolean reversed; @@ -32,10 +27,10 @@ public class UserComparator9 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Ljt;Ljt;B)I", - garbageValue = "-1" + signature = "(Ljt;Ljt;I)I", + garbageValue = "1918568840" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -52,668 +47,22 @@ public class UserComparator9 extends AbstractUserComparator { @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Lkn;ZB)V", - garbageValue = "-115" + signature = "(IB)Liq;", + garbageValue = "35" ) - public static void method3436(AbstractSocket var0, boolean var1) { - if (NetCache.NetCache_socket != null) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var8) { + public static VarbitDefinition method3319(int var0) { + VarbitDefinition var1 = (VarbitDefinition)VarbitDefinition.VarbitDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = VarbitDefinition.VarbitDefinition_archive.takeFile(14, var0); + var1 = new VarbitDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); } - NetCache.NetCache_socket = null; + VarbitDefinition.VarbitDefinition_cached.put(var1, (long)var0); + return var1; } - - 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; - } - } - - NetCache.NetCache_responseHeaderBuffer.offset = 0; - NetCache.NetCache_currentResponse = null; - class32.NetCache_responseArchiveBuffer = null; - NetCache.field3188 = 0; - - while (true) { - NetFileRequest var9 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); - if (var9 == null) { - while (true) { - var9 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); - if (var9 == null) { - if (NetCache.field3184 != 0) { - try { - var2 = new Buffer(4); - var2.writeByte(4); - var2.writeByte(NetCache.field3184); - 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.field3171 = TaskHandler.currentTimeMillis(); - return; - } - - NetCache.NetCache_pendingWritesQueue.addLast(var9); - NetCache.NetCache_pendingWrites.put(var9, var9.key); - ++NetCache.NetCache_pendingWritesCount; - --NetCache.NetCache_pendingResponsesCount; - } - } - - NetCache.NetCache_pendingPriorityWrites.put(var9, var9.key); - ++NetCache.NetCache_pendingPriorityWritesCount; - --NetCache.NetCache_pendingPriorityResponsesCount; - } - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "(II)[B", - garbageValue = "1705481710" - ) - @Export("ByteArrayPool_getArray") - public static synchronized byte[] ByteArrayPool_getArray(int var0) { - return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "33" - ) - @Export("runWidgetOnLoadListener") - static void runWidgetOnLoadListener(int var0) { - if (var0 != -1) { - if (UserComparator3.loadInterface(var0)) { - Widget[] var1 = FloorDecoration.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; - GrandExchangeOfferNameComparator.runScript(var4, 5000000); - } - } - - } - } - } - - @ObfuscatedName("jo") - @ObfuscatedSignature( - signature = "([Lhl;IIIIIIIB)V", - garbageValue = "-75" - ) - @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 || MenuAction.getWidgetClickMask(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { - if (var9.isIf3) { - if (AbstractByteArrayCopier.isComponentHidden(var9)) { - continue; - } - } else if (var9.type == 0 && var9 != class185.mousedOverWidgetIf1 && AbstractByteArrayCopier.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.field823 = true; - Client.field808 = var10; - Client.field825 = var11; - } - - boolean var32 = false; - if (var9.field2651) { - switch(Client.field804) { - case 0: - var32 = true; - case 1: - default: - break; - case 2: - if (Client.field805 == var9.id >>> 16) { - var32 = true; - } - break; - case 3: - if (var9.id == Client.field805) { - 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 (class3.widgetDragDuration == 0) { - Client.clickedWidget = null; - Client.clickedWidgetParent = null; - } - - if (!Client.isMenuOpen) { - class2.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) { - Varcs.addSceneMenuOptions(var17, var18, var12, var13); - } - } else if (var9.contentType == 1338) { - UrlRequester.checkIfMinimapClicked(var9, var10, var11); - } else { - if (var9.contentType == 1400) { - WorldMapRegion.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var33, var10, var11, var9.width, var9.height); - } - - if (!Client.isMenuOpen && var33) { - if (var9.contentType == 1400) { - WorldMapRegion.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18); - } else { - PlayerAppearance.method4079(var9, var17 - var10, var18 - var11); - } - } - - boolean var21; - int var23; - if (var32) { - for (int var20 = 0; var20 < var9.field2592.length; ++var20) { - var21 = false; - boolean var22 = false; - if (!var21 && var9.field2592[var20] != null) { - for (var23 = 0; var23 < var9.field2592[var20].length; ++var23) { - boolean var24 = false; - if (var9.field2695 != null) { - var24 = KeyHandler.KeyHandler_pressedKeys[var9.field2592[var20][var23]]; - } - - if (UserComparator3.method3476(var9.field2592[var20][var23]) || var24) { - var21 = true; - if (var9.field2695 != null && var9.field2695[var20] > Client.cycle) { - break; - } - - byte var25 = var9.field2653[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) { - WorldMapData_1.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); - } else if (var20 == 10) { - Actor.Widget_runOnTargetLeave(); - TextureProvider.selectSpell(var9.id, var9.childIndex, Client.method1655(MenuAction.getWidgetClickMask(var9)), var9.itemId); - Client.selectedSpellActionName = LoginPacket.method3662(var9); - if (Client.selectedSpellActionName == null) { - Client.selectedSpellActionName = "null"; - } - - Client.selectedSpellName = var9.dataText + class222.colorStartTag(16777215); - } - - var23 = var9.field2654[var20]; - if (var9.field2695 == null) { - var9.field2695 = new int[var9.field2592.length]; - } - - if (var9.field2655 == null) { - var9.field2655 = new int[var9.field2592.length]; - } - - if (var23 != 0) { - if (var9.field2695[var20] == 0) { - var9.field2695[var20] = var23 + Client.cycle + var9.field2655[var20]; - } else { - var9.field2695[var20] = var23 + Client.cycle; - } - } else { - var9.field2695[var20] = Integer.MAX_VALUE; - } - } - - if (!var21 && var9.field2695 != null) { - var9.field2695[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 || !JagexCache.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var33) { - var34 = true; - } - - var21 = false; - if ((MouseHandler.MouseHandler_lastButton == 1 || !JagexCache.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) { - UserComparator3.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11); - } - - if (var9.contentType == 1400) { - WorldMapRegion.worldMap.method6378(var17, var18, var33 & var34, var33 & var21); - } - - if (Client.clickedWidget != null && var9 != Client.clickedWidget && var33 && WorldMapData_0.method192(MenuAction.getWidgetClickMask(var9))) { - Client.draggedOnWidget = var9; - } - - if (var9 == Client.clickedWidgetParent) { - Client.field820 = true; - Client.field698 = var10; - Client.field822 = var11; - } - - if (var9.hasListener) { - ScriptEvent var29; - if (var33 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { - 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 || DevicePcmPlayerProvider.dragInventoryWidget != null || Client.isMenuOpen) { - var21 = false; - var34 = false; - var33 = false; - } - - if (!var9.isClicked && var21) { - var9.isClicked = true; - if (var9.onClick != null) { - 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) { - 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) { - 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.field843.addFirst(var29); - } - } - - if (var34 && var9.onHold != null) { - 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) { - 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) { - 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) { - 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.field843.addFirst(var29); - } - } - - if (var9.onTimer != null) { - var29 = new ScriptEvent(); - var29.widget = var9; - var29.args = var9.onTimer; - Client.field900.addFirst(var29); - } - - ScriptEvent var30; - int var35; - int var36; - if (var9.onVarTransmit != null && Client.field829 > var9.field2652) { - if (var9.varTransmitTriggers != null && Client.field829 - var9.field2652 <= 32) { - label880: - for (var35 = var9.field2652; var35 < Client.field829; ++var35) { - var23 = Client.field828[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 label880; - } - } - } - } else { - var29 = new ScriptEvent(); - var29.widget = var9; - var29.args = var9.onVarTransmit; - Client.scriptEvents.addFirst(var29); - } - - var9.field2652 = Client.field829; - } - - if (var9.onInvTransmit != null && Client.field898 > var9.field2585) { - if (var9.invTransmitTriggers != null && Client.field898 - var9.field2585 <= 32) { - label856: - for (var35 = var9.field2585; var35 < Client.field898; ++var35) { - var23 = Client.changedItemContainers[var35 & 31]; - - for (var36 = 0; var36 < var9.invTransmitTriggers.length; ++var36) { - if (var23 == var9.invTransmitTriggers[var36]) { - var30 = new ScriptEvent(); - var30.widget = var9; - var30.args = var9.onInvTransmit; - Client.scriptEvents.addFirst(var30); - break label856; - } - } - } - } else { - var29 = new ScriptEvent(); - var29.widget = var9; - var29.args = var9.onInvTransmit; - Client.scriptEvents.addFirst(var29); - } - - var9.field2585 = Client.field898; - } - - if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field2565) { - if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field2565 <= 32) { - label832: - for (var35 = var9.field2565; 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 label832; - } - } - } - } else { - var29 = new ScriptEvent(); - var29.widget = var9; - var29.args = var9.onStatTransmit; - Client.scriptEvents.addFirst(var29); - } - - var9.field2565 = Client.changedSkillsCount; - } - - if (Client.chatCycle > var9.field2631 && var9.onChatTransmit != null) { - var29 = new ScriptEvent(); - var29.widget = var9; - var29.args = var9.onChatTransmit; - Client.scriptEvents.addFirst(var29); - } - - if (Client.field833 > var9.field2631 && var9.onFriendTransmit != null) { - var29 = new ScriptEvent(); - var29.widget = var9; - var29.args = var9.onFriendTransmit; - Client.scriptEvents.addFirst(var29); - } - - if (Client.field836 > var9.field2631 && var9.onClanTransmit != null) { - var29 = new ScriptEvent(); - var29.widget = var9; - var29.args = var9.onClanTransmit; - Client.scriptEvents.addFirst(var29); - } - - if (Client.field645 > var9.field2631 && var9.onStockTransmit != null) { - var29 = new ScriptEvent(); - var29.widget = var9; - var29.args = var9.onStockTransmit; - Client.scriptEvents.addFirst(var29); - } - - if (Client.field734 > var9.field2631 && var9.field2689 != null) { - var29 = new ScriptEvent(); - var29.widget = var9; - var29.args = var9.field2689; - Client.scriptEvents.addFirst(var29); - } - - if (Client.field834 > var9.field2631 && var9.onMiscTransmit != null) { - var29 = new ScriptEvent(); - var29.widget = var9; - var29.args = var9.onMiscTransmit; - Client.scriptEvents.addFirst(var29); - } - - var9.field2631 = Client.cycleCntr; - if (var9.onKey != null) { - for (var35 = 0; var35 < Client.field889; ++var35) { - ScriptEvent var31 = new ScriptEvent(); - var31.widget = var9; - var31.keyTyped = Client.field865[var35]; - var31.keyPressed = Client.field864[var35]; - var31.args = var9.onKey; - Client.scriptEvents.addFirst(var31); - } - } - } - } - - if (!var9.isIf3) { - if (Client.clickedWidget != null || DevicePcmPlayerProvider.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) { - class185.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; - } else { - class185.mousedOverWidgetIf1 = var9; - } - } - - if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - GrandExchangeOfferWorldComparator.field31 = var9; - } - - if (var9.scrollHeight > var9.height) { - GrandExchangeEvents.method82(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 var27 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); - if (var27 != null) { - 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 (class3.widgetDragDuration == 0) { - Client.clickedWidget = null; - Client.clickedWidgetParent = null; - } - - if (!Client.isMenuOpen) { - class2.addCancelMenuEntry(); - } - } - - Script.updateRootInterface(var27.group, var12, var13, var14, var15, var10, var11); - } - } - } - } - } - } - } } diff --git a/runescape-client/src/main/java/UserList.java b/runescape-client/src/main/java/UserList.java index 2a7b724112..fd98109edc 100644 --- a/runescape-client/src/main/java/UserList.java +++ b/runescape-client/src/main/java/UserList.java @@ -6,35 +6,42 @@ 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("je") +@ObfuscatedName("jb") @Implements("UserList") public abstract class UserList { - @ObfuscatedName("g") + @ObfuscatedName("ba") + @ObfuscatedSignature( + signature = "Lli;" + ) + @Export("worldSelectRightSprite") + static IndexedSprite worldSelectRightSprite; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1586707149 + intValue = -2101264289 ) @Export("capacity") final int capacity; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1996430119 + intValue = -82110221 ) @Export("size") int size; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "[Ljr;" + signature = "[Ljy;" ) @Export("array") User[] array; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("usernamesMap") HashMap usernamesMap; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("previousUsernamesMap") HashMap previousUsernamesMap; - @ObfuscatedName("w") + @ObfuscatedName("a") @Export("comparator") Comparator comparator; @@ -47,26 +54,26 @@ public abstract class UserList { this.previousUsernamesMap = new HashMap(var1 / 8); } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(I)Ljr;", - garbageValue = "-1592540968" + signature = "(B)Ljy;", + garbageValue = "68" ) @Export("newInstance") abstract User newInstance(); - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IB)[Ljr;", - garbageValue = "-122" + signature = "(IB)[Ljy;", + garbageValue = "32" ) @Export("newTypedArray") abstract User[] newTypedArray(int var1); - @ObfuscatedName("n") + @ObfuscatedName("a") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1907320088" + garbageValue = "276707896" ) @Export("clear") public void clear() { @@ -76,30 +83,30 @@ public abstract class UserList { this.previousUsernamesMap.clear(); } - @ObfuscatedName("c") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-375744774" + signature = "(B)I", + garbageValue = "2" ) @Export("getSize") public int getSize() { return this.size; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-1219500573" + signature = "(B)Z", + garbageValue = "-22" ) @Export("isFull") public boolean isFull() { return this.capacity == this.size; } - @ObfuscatedName("t") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Ljb;I)Z", - garbageValue = "-149111552" + signature = "(Ljc;B)Z", + garbageValue = "-17" ) @Export("contains") public boolean contains(Username var1) { @@ -110,10 +117,10 @@ public abstract class UserList { } } - @ObfuscatedName("m") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(Ljb;I)Ljr;", - garbageValue = "1256071424" + signature = "(Ljc;I)Ljy;", + garbageValue = "1801288220" ) @Export("getByUsername") public User getByUsername(Username var1) { @@ -121,30 +128,30 @@ public abstract class UserList { return var2 != null ? var2 : this.getByPreviousUsername(var1); } - @ObfuscatedName("v") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Ljb;I)Ljr;", - garbageValue = "1486275589" + signature = "(Ljc;I)Ljy;", + garbageValue = "-877412517" ) @Export("getByCurrentUsername") User getByCurrentUsername(Username var1) { return !var1.hasCleanName() ? null : (User)this.usernamesMap.get(var1); } - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Ljb;I)Ljr;", - garbageValue = "-434760429" + signature = "(Ljc;I)Ljy;", + garbageValue = "1064087548" ) @Export("getByPreviousUsername") User getByPreviousUsername(Username var1) { return !var1.hasCleanName() ? null : (User)this.previousUsernamesMap.get(var1); } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Ljb;I)Z", - garbageValue = "1488829277" + signature = "(Ljc;I)Z", + garbageValue = "1761929838" ) @Export("removeByUsername") public final boolean removeByUsername(Username var1) { @@ -157,10 +164,10 @@ public abstract class UserList { } } - @ObfuscatedName("j") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Ljr;I)V", - garbageValue = "-23502299" + signature = "(Ljy;I)V", + garbageValue = "1344275485" ) @Export("remove") final void remove(User var1) { @@ -171,20 +178,20 @@ public abstract class UserList { } } - @ObfuscatedName("ad") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(Ljb;I)Ljr;", - garbageValue = "16711680" + signature = "(Ljc;I)Ljy;", + garbageValue = "-1788654627" ) @Export("addLastNoPreviousUsername") User addLastNoPreviousUsername(Username var1) { return this.addLast(var1, (Username)null); } - @ObfuscatedName("am") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(Ljb;Ljb;I)Ljr;", - garbageValue = "-1408051568" + signature = "(Ljc;Ljc;I)Ljy;", + garbageValue = "-814300512" ) @Export("addLast") User addLast(Username var1, Username var2) { @@ -199,10 +206,10 @@ public abstract class UserList { } } - @ObfuscatedName("ai") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(II)Ljr;", - garbageValue = "1364470025" + signature = "(IS)Ljy;", + garbageValue = "-10703" ) @Export("get") public final User get(int var1) { @@ -213,10 +220,10 @@ public abstract class UserList { } } - @ObfuscatedName("ag") + @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-23" + signature = "(I)V", + garbageValue = "296571009" ) @Export("sort") public final void sort() { @@ -228,10 +235,10 @@ public abstract class UserList { } - @ObfuscatedName("ao") + @ObfuscatedName("av") @ObfuscatedSignature( - signature = "(Ljr;Ljb;Ljb;B)V", - garbageValue = "48" + signature = "(Ljy;Ljc;Ljc;B)V", + garbageValue = "-18" ) @Export("changeName") final void changeName(User var1, Username var2, Username var3) { @@ -242,8 +249,8 @@ public abstract class UserList { @ObfuscatedName("aw") @ObfuscatedSignature( - signature = "(Ljr;I)I", - garbageValue = "790634054" + signature = "(Ljy;I)I", + garbageValue = "607308278" ) @Export("indexOf") final int indexOf(User var1) { @@ -256,10 +263,10 @@ public abstract class UserList { return -1; } - @ObfuscatedName("ak") + @ObfuscatedName("as") @ObfuscatedSignature( - signature = "(Ljr;I)V", - garbageValue = "-1688950859" + signature = "(Ljy;I)V", + garbageValue = "243308006" ) @Export("mapRemove") final void mapRemove(User var1) { @@ -273,20 +280,20 @@ public abstract class UserList { } } - @ObfuscatedName("aa") + @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "(Ljr;B)V", - garbageValue = "-92" + signature = "(Ljy;I)V", + garbageValue = "760547455" ) @Export("arrayAddLast") final void arrayAddLast(User var1) { this.array[++this.size - 1] = var1; } - @ObfuscatedName("ab") + @ObfuscatedName("au") @ObfuscatedSignature( - signature = "(Ljr;I)V", - garbageValue = "314346043" + signature = "(Ljy;B)V", + garbageValue = "1" ) @Export("mapPut") final void mapPut(User var1) { @@ -300,10 +307,10 @@ public abstract class UserList { } - @ObfuscatedName("ar") + @ObfuscatedName("ah") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "602871517" + garbageValue = "486481485" ) @Export("arrayRemove") final void arrayRemove(int var1) { @@ -314,20 +321,20 @@ public abstract class UserList { } - @ObfuscatedName("av") + @ObfuscatedName("aq") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "67" + garbageValue = "-25" ) @Export("removeComparator") public final void removeComparator() { this.comparator = null; } - @ObfuscatedName("aq") + @ObfuscatedName("ao") @ObfuscatedSignature( signature = "(Ljava/util/Comparator;B)V", - garbageValue = "99" + garbageValue = "-73" ) @Export("addComparator") public final void addComparator(Comparator var1) { @@ -339,47 +346,29 @@ public abstract class UserList { } - @ObfuscatedName("jn") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lhl;I)V", - garbageValue = "1273300851" + signature = "(ILcu;ZB)I", + garbageValue = "28" ) - static final void method5233(Widget var0) { - int var1 = var0.contentType; - if (var1 == 324) { - if (Client.field906 == -1) { - Client.field906 = var0.spriteId2; - Client.field907 = var0.spriteId; - } - - if (Client.playerAppearance.isFemale) { - var0.spriteId2 = Client.field906; + static int method5193(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? UserComparator7.field1946 : class197.field2398; + if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.itemId; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { + if (var3.itemId != -1) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.itemQuantity; } else { - var0.spriteId2 = Client.field907; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; } - } else if (var1 == 325) { - if (Client.field906 == -1) { - Client.field906 = var0.spriteId2; - Client.field907 = var0.spriteId; - } - - if (Client.playerAppearance.isFemale) { - var0.spriteId2 = Client.field907; - } else { - var0.spriteId2 = Client.field906; - } - - } 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; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETID) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.childIndex; + return 1; + } else { + return 2; } } } diff --git a/runescape-client/src/main/java/Username.java b/runescape-client/src/main/java/Username.java index 118c481e1d..f3bff91b51 100644 --- a/runescape-client/src/main/java/Username.java +++ b/runescape-client/src/main/java/Username.java @@ -3,48 +3,237 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jb") +@ObfuscatedName("jc") @Implements("Username") public class Username implements Comparable { - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("name") String name; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("cleanName") String cleanName; @ObfuscatedSignature( - signature = "(Ljava/lang/String;Llg;)V" + signature = "(Ljava/lang/String;Lll;)V" ) public Username(String var1, LoginType var2) { this.name = var1; - this.cleanName = StudioGame.method4228(var1, var2); + String var4; + if (var1 == null) { + var4 = null; + } else { + label164: { + int var5 = 0; + + int var6; + boolean var7; + char var8; + for (var6 = var1.length(); var5 < var6; ++var5) { + var8 = var1.charAt(var5); + var7 = var8 == 160 || var8 == ' ' || var8 == '_' || var8 == '-'; + if (!var7) { + break; + } + } + + while (var6 > var5) { + var8 = var1.charAt(var6 - 1); + var7 = var8 == 160 || var8 == ' ' || var8 == '_' || var8 == '-'; + if (!var7) { + break; + } + + --var6; + } + + int var17 = var6 - var5; + if (var17 >= 1) { + byte var9; + if (var2 == null) { + var9 = 12; + } else { + switch(var2.field4029) { + case 4: + var9 = 20; + break; + default: + var9 = 12; + } + } + + if (var17 <= var9) { + StringBuilder var15 = new StringBuilder(var17); + + for (int var18 = var5; var18 < var6; ++var18) { + char var10 = var1.charAt(var18); + boolean var11; + if (Character.isISOControl(var10)) { + var11 = false; + } else if (class191.isAlphaNumeric(var10)) { + var11 = true; + } else { + char[] var16 = class338.field4037; + int var13 = 0; + + label117: + while (true) { + char var14; + if (var13 >= var16.length) { + var16 = class338.field4035; + + for (var13 = 0; var13 < var16.length; ++var13) { + var14 = var16[var13]; + if (var14 == var10) { + var11 = true; + break label117; + } + } + + var11 = false; + break; + } + + var14 = var16[var13]; + if (var10 == var14) { + var11 = true; + break; + } + + ++var13; + } + } + + if (var11) { + char var12; + switch(var10) { + case ' ': + case '-': + case '_': + case ' ': + var12 = '_'; + break; + case '#': + case '[': + case ']': + var12 = var10; + break; + case 'À': + case 'Á': + case 'Â': + case 'Ã': + case 'Ä': + case 'à': + case 'á': + case 'â': + case 'ã': + case 'ä': + var12 = 'a'; + break; + case 'Ç': + case 'ç': + var12 = 'c'; + break; + case 'È': + case 'É': + case 'Ê': + case 'Ë': + case 'è': + case 'é': + case 'ê': + case 'ë': + var12 = 'e'; + break; + case 'Í': + case 'Î': + case 'Ï': + case 'í': + case 'î': + case 'ï': + var12 = 'i'; + break; + case 'Ñ': + case 'ñ': + var12 = 'n'; + break; + case 'Ò': + case 'Ó': + case 'Ô': + case 'Õ': + case 'Ö': + case 'ò': + case 'ó': + case 'ô': + case 'õ': + case 'ö': + var12 = 'o'; + break; + case 'Ù': + case 'Ú': + case 'Û': + case 'Ü': + case 'ù': + case 'ú': + case 'û': + case 'ü': + var12 = 'u'; + break; + case 'ß': + var12 = 'b'; + break; + case 'ÿ': + case 'Ÿ': + var12 = 'y'; + break; + default: + var12 = Character.toLowerCase(var10); + } + + if (var12 != 0) { + var15.append(var12); + } + } + } + + if (var15.length() == 0) { + var4 = null; + } else { + var4 = var15.toString(); + } + break label164; + } + } + + var4 = null; + } + } + + this.cleanName = var4; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(B)Ljava/lang/String;", - garbageValue = "70" + signature = "(I)Ljava/lang/String;", + garbageValue = "-2024242176" ) @Export("getName") public String getName() { return this.name; } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "-102" + signature = "(I)Z", + garbageValue = "-190673782" ) @Export("hasCleanName") public boolean hasCleanName() { return this.cleanName != null; } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Ljb;I)I", - garbageValue = "1816661585" + signature = "(Ljc;I)I", + garbageValue = "-2128174200" ) @Export("compareToTyped") public int compareToTyped(Username var1) { @@ -74,11 +263,11 @@ public class Username implements Comparable { return this.cleanName == null ? 0 : this.cleanName.hashCode(); } - public int compareTo(Object var1) { - return this.compareToTyped((Username)var1); - } - public String toString() { return this.getName(); } + + public int compareTo(Object var1) { + return this.compareToTyped((Username)var1); + } } diff --git a/runescape-client/src/main/java/Usernamed.java b/runescape-client/src/main/java/Usernamed.java index c190d7a1a0..7d03dcd218 100644 --- a/runescape-client/src/main/java/Usernamed.java +++ b/runescape-client/src/main/java/Usernamed.java @@ -6,10 +6,10 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("jv") @Implements("Usernamed") public interface Usernamed { - @ObfuscatedName("kt") + @ObfuscatedName("lv") @ObfuscatedSignature( - signature = "(B)Ljb;", - garbageValue = "70" + signature = "(I)Ljc;", + garbageValue = "83008429" ) @Export("username") Username username(); diff --git a/runescape-client/src/main/java/VarbitDefinition.java b/runescape-client/src/main/java/VarbitDefinition.java index b01a79e48f..4799402966 100644 --- a/runescape-client/src/main/java/VarbitDefinition.java +++ b/runescape-client/src/main/java/VarbitDefinition.java @@ -7,39 +7,33 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("iq") @Implements("VarbitDefinition") public class VarbitDefinition extends DualNode { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lhf;" + signature = "Lhz;" ) @Export("VarbitDefinition_archive") public static AbstractArchive VarbitDefinition_archive; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lef;" + signature = "Leb;" ) @Export("VarbitDefinition_cached") - public static EvictingDualNodeHashTable VarbitDefinition_cached; - @ObfuscatedName("bq") - @ObfuscatedSignature( - signature = "Lgc;" - ) - @Export("clientLanguage") - static Language clientLanguage; - @ObfuscatedName("b") + static EvictingDualNodeHashTable VarbitDefinition_cached; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1459744961 + intValue = -254384539 ) @Export("baseVar") public int baseVar; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1129400401 + intValue = 1384432493 ) @Export("startBit") public int startBit; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1232429709 + intValue = 1295947567 ) @Export("endBit") public int endBit; @@ -48,13 +42,16 @@ public class VarbitDefinition extends DualNode { VarbitDefinition_cached = new EvictingDualNodeHashTable(64); } - @ObfuscatedName("f") + VarbitDefinition() { + } + + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkg;I)V", - garbageValue = "1116015657" + signature = "(Lkq;I)V", + garbageValue = "-345578680" ) @Export("decode") - public void decode(Buffer var1) { + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { @@ -65,10 +62,10 @@ public class VarbitDefinition extends DualNode { } } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Lkg;II)V", - garbageValue = "-1963892164" + signature = "(Lkq;II)V", + garbageValue = "587356481" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -80,45 +77,392 @@ public class VarbitDefinition extends DualNode { } - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(IZI)Ljava/lang/String;", - garbageValue = "-1033924108" + signature = "(IIIIIILej;Lfp;I)V", + garbageValue = "1458091533" ) - @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 method4500(int var0, int var1, int var2, int var3, int var4, int var5, Scene var6, CollisionMap var7) { + if (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) { + if (var0 < Tiles.Tiles_minPlane) { + Tiles.Tiles_minPlane = var0; + } - for (int var5 = var0 / 10; var5 != 0; ++var4) { - var5 /= 10; + ObjectDefinition var8 = Coord.getObjectDefinition(var3); + int var9; + int var10; + if (var4 != 1 && var4 != 3) { + var9 = var8.sizeX; + var10 = var8.sizeY; + } else { + var9 = var8.sizeY; + var10 = var8.sizeX; + } + + int var11; + int var12; + if (var9 + var1 <= 104) { + var11 = (var9 >> 1) + var1; + var12 = (var9 + 1 >> 1) + var1; + } else { + var11 = var1; + var12 = var1 + 1; + } + + int var13; + int var14; + if (var10 + var2 <= 104) { + var13 = (var10 >> 1) + var2; + var14 = var2 + (var10 + 1 >> 1); + } else { + var13 = var2; + var14 = var2 + 1; + } + + int[][] var15 = Tiles.Tiles_heights[var0]; + int var16 = var15[var11][var13] + var15[var12][var13] + var15[var11][var14] + var15[var12][var14] >> 2; + int var17 = (var1 << 7) + (var9 << 6); + int var18 = (var2 << 7) + (var10 << 6); + long var19 = KeyHandler.calculateTag(var1, var2, 2, var8.int1 == 0, var3); + int var21 = var5 + (var4 << 6); + if (var8.int3 == 1) { + var21 += 256; + } + + int var23; + int var24; + if (var8.hasSound()) { + ObjectSound var22 = new ObjectSound(); + var22.plane = var0; + var22.x = var1 * 16384; + var22.y = var2 * 128; + var23 = var8.sizeX; + var24 = var8.sizeY; + if (var4 == 1 || var4 == 3) { + var23 = var8.sizeY; + var24 = var8.sizeX; } - char[] var6 = new char[var4]; - var6[0] = '+'; + var22.field1064 = (var23 + var1) * 128; + var22.field1052 = (var24 + var2) * 128; + var22.soundEffectId = var8.ambientSoundId; + var22.field1053 = var8.int4 * 128; + var22.field1060 = var8.int5; + var22.field1061 = var8.int6; + var22.soundEffectIds = var8.soundEffectIds; + if (var8.transforms != null) { + var22.obj = var8; + var22.set(); + } - 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); + ObjectSound.objectSounds.addFirst(var22); + if (var22.soundEffectIds != null) { + var22.field1055 = var22.field1060 + (int)(Math.random() * (double)(var22.field1061 - var22.field1060)); + } + } + + Object var34; + if (var5 == 22) { + if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { + if (var8.animationId == -1 && var8.transforms == null) { + var34 = var8.getEntity(22, var4, var15, var17, var16, var18); } else { - var6[var7] = (char)(var9 + 48); + var34 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newFloorDecoration(var0, var1, var2, var16, (Entity)var34, var19, var21); + if (var8.interactType == 1 && var7 != null) { + var7.setBlockedByFloorDec(var1, var2); + } + + } + } else if (var5 != 10 && var5 != 11) { + int[] var10000; + if (var5 >= 12) { + if (var8.animationId == -1 && var8.transforms == null) { + var34 = var8.getEntity(var5, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.method3141(var0, var1, var2, var16, 1, 1, (Entity)var34, 0, var19, var21); + if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { + var10000 = Tiles.field501[var0][var1]; + var10000[var2] |= 2340; + } + + if (var8.interactType != 0 && var7 != null) { + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + } else if (var5 == 0) { + if (var8.animationId == -1 && var8.transforms == null) { + var34 = var8.getEntity(0, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.field499[var4], 0, var19, var21); + if (var4 == 0) { + if (var8.clipped) { + Tiles.field496[var0][var1][var2] = 50; + Tiles.field496[var0][var1][var2 + 1] = 50; + } + + if (var8.modelClipped) { + var10000 = Tiles.field501[var0][var1]; + var10000[var2] |= 585; + } + } else if (var4 == 1) { + if (var8.clipped) { + Tiles.field496[var0][var1][var2 + 1] = 50; + Tiles.field496[var0][var1 + 1][var2 + 1] = 50; + } + + if (var8.modelClipped) { + var10000 = Tiles.field501[var0][var1]; + var10000[var2 + 1] |= 1170; + } + } else if (var4 == 2) { + if (var8.clipped) { + Tiles.field496[var0][var1 + 1][var2] = 50; + Tiles.field496[var0][var1 + 1][var2 + 1] = 50; + } + + if (var8.modelClipped) { + var10000 = Tiles.field501[var0][var1 + 1]; + var10000[var2] |= 585; + } + } else if (var4 == 3) { + if (var8.clipped) { + Tiles.field496[var0][var1][var2] = 50; + Tiles.field496[var0][var1 + 1][var2] = 50; + } + + if (var8.modelClipped) { + var10000 = Tiles.field501[var0][var1]; + var10000[var2] |= 1170; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method3552(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { + var6.method3109(var0, var1, var2, var8.int2); + } + + } else if (var5 == 1) { + if (var8.animationId == -1 && var8.transforms == null) { + var34 = var8.getEntity(1, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.field500[var4], 0, var19, var21); + if (var8.clipped) { + if (var4 == 0) { + Tiles.field496[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { + Tiles.field496[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { + Tiles.field496[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { + Tiles.field496[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method3552(var1, var2, var5, var4, var8.boolean1); + } + + } else { + int var28; + if (var5 == 2) { + var28 = var4 + 1 & 3; + Object var29; + Object var30; + if (var8.animationId == -1 && var8.transforms == null) { + var29 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); + var30 = var8.getEntity(2, var28, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + var30 = new DynamicObject(var3, 2, var28, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var29, (Entity)var30, Tiles.field499[var4], Tiles.field499[var28], var19, var21); + if (var8.modelClipped) { + if (var4 == 0) { + var10000 = Tiles.field501[var0][var1]; + var10000[var2] |= 585; + var10000 = Tiles.field501[var0][var1]; + var10000[1 + var2] |= 1170; + } else if (var4 == 1) { + var10000 = Tiles.field501[var0][var1]; + var10000[1 + var2] |= 1170; + var10000 = Tiles.field501[var0][var1 + 1]; + var10000[var2] |= 585; + } else if (var4 == 2) { + var10000 = Tiles.field501[var0][var1 + 1]; + var10000[var2] |= 585; + var10000 = Tiles.field501[var0][var1]; + var10000[var2] |= 1170; + } else if (var4 == 3) { + var10000 = Tiles.field501[var0][var1]; + var10000[var2] |= 1170; + var10000 = Tiles.field501[var0][var1]; + var10000[var2] |= 585; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method3552(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { + var6.method3109(var0, var1, var2, var8.int2); + } + + } else if (var5 == 3) { + if (var8.animationId == -1 && var8.transforms == null) { + var34 = var8.getEntity(3, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.field500[var4], 0, var19, var21); + if (var8.clipped) { + if (var4 == 0) { + Tiles.field496[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { + Tiles.field496[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { + Tiles.field496[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { + Tiles.field496[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method3552(var1, var2, var5, var4, var8.boolean1); + } + + } else if (var5 == 9) { + if (var8.animationId == -1 && var8.transforms == null) { + var34 = var8.getEntity(var5, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.method3141(var0, var1, var2, var16, 1, 1, (Entity)var34, 0, var19, var21); + if (var8.interactType != 0 && var7 != null) { + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + if (var8.int2 != 16) { + var6.method3109(var0, var1, var2, var8.int2); + } + + } else if (var5 == 4) { + if (var8.animationId == -1 && var8.transforms == null) { + var34 = var8.getEntity(4, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.field499[var4], 0, 0, 0, var19, var21); + } else { + long var31; + Object var33; + if (var5 == 5) { + var28 = 16; + var31 = var6.getBoundaryObjectTag(var0, var1, var2); + if (0L != var31) { + var28 = Coord.getObjectDefinition(class2.Entity_unpackID(var31)).int2; + } + + if (var8.animationId == -1 && var8.transforms == null) { + var33 = var8.getEntity(4, var4, var15, var17, var16, var18); + } else { + var33 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)null, Tiles.field499[var4], 0, var28 * Tiles.field506[var4], var28 * Tiles.field502[var4], var19, var21); + } else if (var5 == 6) { + var28 = 8; + var31 = var6.getBoundaryObjectTag(var0, var1, var2); + if (0L != var31) { + var28 = Coord.getObjectDefinition(class2.Entity_unpackID(var31)).int2 / 2; + } + + if (var8.animationId == -1 && var8.transforms == null) { + var33 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); + } else { + var33 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)null, 256, var4, var28 * Tiles.field503[var4], var28 * Tiles.field504[var4], var19, var21); + } else if (var5 == 7) { + var23 = var4 + 2 & 3; + if (var8.animationId == -1 && var8.transforms == null) { + var34 = var8.getEntity(4, var23 + 4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 4, var23 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var34, (Entity)null, 256, var23, 0, 0, var19, var21); + } else if (var5 == 8) { + var28 = 8; + var31 = var6.getBoundaryObjectTag(var0, var1, var2); + if (var31 != 0L) { + var28 = Coord.getObjectDefinition(class2.Entity_unpackID(var31)).int2 / 2; + } + + int var27 = var4 + 2 & 3; + Object var26; + if (var8.animationId == -1 && var8.transforms == null) { + var33 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); + var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); + } else { + var33 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)var26, 256, var4, var28 * Tiles.field503[var4], var28 * Tiles.field504[var4], var19, var21); + } + } + } + } else { + if (var8.animationId == -1 && var8.transforms == null) { + var34 = var8.getEntity(10, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + if (var34 != null && var6.method3141(var0, var1, var2, var16, var9, var10, (Entity)var34, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { + var23 = 15; + if (var34 instanceof Model) { + var23 = ((Model)var34).method2893() / 4; + if (var23 > 30) { + var23 = 30; + } + } + + for (var24 = 0; var24 <= var9; ++var24) { + for (int var25 = 0; var25 <= var10; ++var25) { + if (var23 > Tiles.field496[var0][var24 + var1][var25 + var2]) { + Tiles.field496[var0][var24 + var1][var25 + var2] = (byte)var23; + } + } } } - var2 = new String(var6); - } else { - var2 = Integer.toString(var0, 10); - } + if (var8.interactType != 0 && var7 != null) { + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } - return var2; - } else { - return Integer.toString(var0); + } } } } diff --git a/runescape-client/src/main/java/VarcInt.java b/runescape-client/src/main/java/VarcInt.java index fff5e7d3f4..ee590bef8c 100644 --- a/runescape-client/src/main/java/VarcInt.java +++ b/runescape-client/src/main/java/VarcInt.java @@ -1,36 +1,24 @@ -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; -import net.runelite.rs.Reflection; -@ObfuscatedName("ia") +@ObfuscatedName("ir") @Implements("VarcInt") public class VarcInt extends DualNode { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lhf;" + signature = "Lhz;" ) @Export("VarcInt_archive") public static AbstractArchive VarcInt_archive; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lef;" + signature = "Leb;" ) @Export("VarcInt_cached") static EvictingDualNodeHashTable VarcInt_cached; - @ObfuscatedName("h") - @Export("SpriteBuffer_spriteHeights") - static int[] SpriteBuffer_spriteHeights; - @ObfuscatedName("fa") - @ObfuscatedGetter( - intValue = -1499248159 - ) - @Export("baseY") - static int baseY; - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("persist") public boolean persist; @@ -42,94 +30,327 @@ public class VarcInt extends DualNode { this.persist = false; } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkg;I)V", - garbageValue = "-407905796" + signature = "(Lkq;I)V", + garbageValue = "824733769" ) - void method4485(Buffer var1) { + void method4388(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.method4486(var1, var2); + this.method4387(var1, var2); } } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Lkg;IB)V", - garbageValue = "-67" + signature = "(Lkq;II)V", + garbageValue = "-793810965" ) - void method4486(Buffer var1, int var2) { + void method4387(Buffer var1, int var2) { if (var2 == 2) { this.persist = true; } } - @ObfuscatedName("u") + @ObfuscatedName("hk") @ObfuscatedSignature( - signature = "(Ljava/awt/Component;B)V", - garbageValue = "85" + signature = "(IIIIIIII)V", + garbageValue = "11345169" ) - static void method4484(Component var0) { - var0.addMouseListener(MouseHandler.MouseHandler_instance); - var0.addMouseMotionListener(MouseHandler.MouseHandler_instance); - var0.addFocusListener(MouseHandler.MouseHandler_instance); - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(II)Lih;", - garbageValue = "1798735547" - ) - @Export("getNpcDefinition") - public static NPCDefinition getNpcDefinition(int var0) { - NPCDefinition var1 = (NPCDefinition)NPCDefinition.NpcDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = NPCDefinition.NpcDefinition_archive.takeFile(9, var0); - var1 = new NPCDefinition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); + @Export("addPendingSpawnToScene") + static final void addPendingSpawnToScene(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) { + if (Client.isLowDetail && var0 != UrlRequest.Client_plane) { + return; } - var1.postDecode(); - NPCDefinition.NpcDefinition_cached.put(var1, (long)var0); - return var1; - } - } + long var7 = 0L; + boolean var9 = true; + boolean var10 = false; + boolean var11 = false; + if (var1 == 0) { + var7 = class14.scene.getBoundaryObjectTag(var0, var2, var3); + } - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;S)Ljava/lang/Class;", - garbageValue = "2623" - ) - @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); + if (var1 == 1) { + var7 = class14.scene.getWallDecorationTag(var0, var2, var3); + } + + if (var1 == 2) { + var7 = class14.scene.getGameObjectTag(var0, var2, var3); + } + + if (var1 == 3) { + var7 = class14.scene.getFloorDecorationTag(var0, var2, var3); + } + + int var12; + if (0L != var7) { + var12 = class14.scene.getObjectFlags(var0, var2, var3, var7); + int var39 = class2.Entity_unpackID(var7); + int var40 = var12 & 31; + int var41 = var12 >> 6 & 3; + ObjectDefinition var13; + if (var1 == 0) { + class14.scene.removeBoundaryObject(var0, var2, var3); + var13 = Coord.getObjectDefinition(var39); + if (var13.interactType != 0) { + Client.collisionMaps[var0].method3534(var2, var3, var40, var41, var13.boolean1); + } + } + + if (var1 == 1) { + class14.scene.removeWallDecoration(var0, var2, var3); + } + + if (var1 == 2) { + class14.scene.removeGameObject(var0, var2, var3); + var13 = Coord.getObjectDefinition(var39); + if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { + return; + } + + if (var13.interactType != 0) { + Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var41, var13.boolean1); + } + } + + if (var1 == 3) { + class14.scene.removeFloorDecoration(var0, var2, var3); + var13 = Coord.getObjectDefinition(var39); + if (var13.interactType == 1) { + Client.collisionMaps[var0].method3535(var2, var3); + } + } + } + + if (var4 >= 0) { + var12 = var0; + if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { + var12 = var0 + 1; + } + + Scene var42 = class14.scene; + CollisionMap var14 = Client.collisionMaps[var0]; + ObjectDefinition var15 = Coord.getObjectDefinition(var4); + int var16; + int var17; + if (var5 != 1 && var5 != 3) { + var16 = var15.sizeX; + var17 = var15.sizeY; + } else { + var16 = var15.sizeY; + var17 = var15.sizeX; + } + + int var18; + int var19; + if (var16 + var2 <= 104) { + var18 = (var16 >> 1) + var2; + var19 = var2 + (var16 + 1 >> 1); + } else { + var18 = var2; + var19 = var2 + 1; + } + + int var20; + int var21; + if (var3 + var17 <= 104) { + var20 = var3 + (var17 >> 1); + var21 = var3 + (var17 + 1 >> 1); + } else { + var20 = var3; + var21 = var3 + 1; + } + + int[][] var22 = Tiles.Tiles_heights[var12]; + int var23 = var22[var19][var21] + var22[var18][var20] + var22[var19][var20] + var22[var18][var21] >> 2; + int var24 = (var2 << 7) + (var16 << 6); + int var25 = (var3 << 7) + (var17 << 6); + long var26 = KeyHandler.calculateTag(var2, var3, 2, var15.int1 == 0, var4); + int var28 = (var5 << 6) + var6; + if (var15.int3 == 1) { + var28 += 256; + } + + Object var29; + if (var6 == 22) { + if (var15.animationId == -1 && var15.transforms == null) { + var29 = var15.getModel(22, var5, var22, var24, var23, var25); + } else { + var29 = new DynamicObject(var4, 22, var5, var12, var2, var3, var15.animationId, true, (Entity)null); + } + + var42.newFloorDecoration(var0, var2, var3, var23, (Entity)var29, var26, var28); + if (var15.interactType == 1) { + var14.setBlockedByFloorDec(var2, var3); + } + } else if (var6 != 10 && var6 != 11) { + if (var6 >= 12) { + if (var15.animationId == -1 && var15.transforms == null) { + var29 = var15.getModel(var6, var5, var22, var24, var23, var25); + } else { + var29 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, true, (Entity)null); + } + + var42.method3141(var0, var2, var3, var23, 1, 1, (Entity)var29, 0, var26, var28); + if (var15.interactType != 0) { + var14.addGameObject(var2, var3, var16, var17, var15.boolean1); + } + } else if (var6 == 0) { + if (var15.animationId == -1 && var15.transforms == null) { + var29 = var15.getModel(0, var5, var22, var24, var23, var25); + } else { + var29 = new DynamicObject(var4, 0, var5, var12, var2, var3, var15.animationId, true, (Entity)null); + } + + var42.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field499[var5], 0, var26, var28); + if (var15.interactType != 0) { + var14.method3552(var2, var3, var6, var5, var15.boolean1); + } + } else if (var6 == 1) { + if (var15.animationId == -1 && var15.transforms == null) { + var29 = var15.getModel(1, var5, var22, var24, var23, var25); + } else { + var29 = new DynamicObject(var4, 1, var5, var12, var2, var3, var15.animationId, true, (Entity)null); + } + + var42.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field500[var5], 0, var26, var28); + if (var15.interactType != 0) { + var14.method3552(var2, var3, var6, var5, var15.boolean1); + } + } else { + int var35; + if (var6 == 2) { + var35 = var5 + 1 & 3; + Object var30; + Object var31; + if (var15.animationId == -1 && var15.transforms == null) { + var30 = var15.getModel(2, var5 + 4, var22, var24, var23, var25); + var31 = var15.getModel(2, var35, var22, var24, var23, var25); + } else { + var30 = new DynamicObject(var4, 2, var5 + 4, var12, var2, var3, var15.animationId, true, (Entity)null); + var31 = new DynamicObject(var4, 2, var35, var12, var2, var3, var15.animationId, true, (Entity)null); + } + + var42.newBoundaryObject(var0, var2, var3, var23, (Entity)var30, (Entity)var31, Tiles.field499[var5], Tiles.field499[var35], var26, var28); + if (var15.interactType != 0) { + var14.method3552(var2, var3, var6, var5, var15.boolean1); + } + } else if (var6 == 3) { + if (var15.animationId == -1 && var15.transforms == null) { + var29 = var15.getModel(3, var5, var22, var24, var23, var25); + } else { + var29 = new DynamicObject(var4, 3, var5, var12, var2, var3, var15.animationId, true, (Entity)null); + } + + var42.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field500[var5], 0, var26, var28); + if (var15.interactType != 0) { + var14.method3552(var2, var3, var6, var5, var15.boolean1); + } + } else if (var6 == 9) { + if (var15.animationId == -1 && var15.transforms == null) { + var29 = var15.getModel(var6, var5, var22, var24, var23, var25); + } else { + var29 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, true, (Entity)null); + } + + var42.method3141(var0, var2, var3, var23, 1, 1, (Entity)var29, 0, var26, var28); + if (var15.interactType != 0) { + var14.addGameObject(var2, var3, var16, var17, var15.boolean1); + } + } else if (var6 == 4) { + if (var15.animationId == -1 && var15.transforms == null) { + var29 = var15.getModel(4, var5, var22, var24, var23, var25); + } else { + var29 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, true, (Entity)null); + } + + var42.newWallDecoration(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field499[var5], 0, 0, 0, var26, var28); + } else { + Object var32; + long var36; + if (var6 == 5) { + var35 = 16; + var36 = var42.getBoundaryObjectTag(var0, var2, var3); + if (0L != var36) { + var35 = Coord.getObjectDefinition(class2.Entity_unpackID(var36)).int2; + } + + if (var15.animationId == -1 && var15.transforms == null) { + var32 = var15.getModel(4, var5, var22, var24, var23, var25); + } else { + var32 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, true, (Entity)null); + } + + var42.newWallDecoration(var0, var2, var3, var23, (Entity)var32, (Entity)null, Tiles.field499[var5], 0, var35 * Tiles.field506[var5], var35 * Tiles.field502[var5], var26, var28); + } else if (var6 == 6) { + var35 = 8; + var36 = var42.getBoundaryObjectTag(var0, var2, var3); + if (var36 != 0L) { + var35 = Coord.getObjectDefinition(class2.Entity_unpackID(var36)).int2 / 2; + } + + if (var15.animationId == -1 && var15.transforms == null) { + var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); + } else { + var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, true, (Entity)null); + } + + var42.newWallDecoration(var0, var2, var3, var23, (Entity)var32, (Entity)null, 256, var5, var35 * Tiles.field503[var5], var35 * Tiles.field504[var5], var26, var28); + } else if (var6 == 7) { + int var38 = var5 + 2 & 3; + if (var15.animationId == -1 && var15.transforms == null) { + var29 = var15.getModel(4, var38 + 4, var22, var24, var23, var25); + } else { + var29 = new DynamicObject(var4, 4, var38 + 4, var12, var2, var3, var15.animationId, true, (Entity)null); + } + + var42.newWallDecoration(var0, var2, var3, var23, (Entity)var29, (Entity)null, 256, var38, 0, 0, var26, var28); + } else if (var6 == 8) { + var35 = 8; + var36 = var42.getBoundaryObjectTag(var0, var2, var3); + if (0L != var36) { + var35 = Coord.getObjectDefinition(class2.Entity_unpackID(var36)).int2 / 2; + } + + int var34 = var5 + 2 & 3; + Object var33; + if (var15.animationId == -1 && var15.transforms == null) { + var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); + var33 = var15.getModel(4, var34 + 4, var22, var24, var23, var25); + } else { + var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, true, (Entity)null); + var33 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var15.animationId, true, (Entity)null); + } + + var42.newWallDecoration(var0, var2, var3, var23, (Entity)var32, (Entity)var33, 256, var5, var35 * Tiles.field503[var5], var35 * Tiles.field504[var5], var26, var28); + } + } + } + } else { + if (var15.animationId == -1 && var15.transforms == null) { + var29 = var15.getModel(10, var5, var22, var24, var23, var25); + } else { + var29 = new DynamicObject(var4, 10, var5, var12, var2, var3, var15.animationId, true, (Entity)null); + } + + if (var29 != null) { + var42.method3141(var0, var2, var3, var23, var16, var17, (Entity)var29, var6 == 11 ? 256 : 0, var26, var28); + } + + if (var15.interactType != 0) { + var14.addGameObject(var2, var3, var16, var17, var15.boolean1); + } + } + } } + } } diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java index 4bb6ebfb93..6bbb36603b 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -8,54 +8,55 @@ 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("cj") +@ObfuscatedName("ck") @Implements("Varcs") public class Varcs { - @ObfuscatedName("b") + @ObfuscatedName("k") + static int[] field1244; + @ObfuscatedName("y") @Export("intsPersistence") boolean[] intsPersistence; - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("map") Map map; - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("strings") String[] strings; - @ObfuscatedName("p") + @ObfuscatedName("b") @Export("unwrittenChanges") boolean unwrittenChanges; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - longValue = 1873182540653835357L + longValue = -327975599859265227L ) - long field1267; + long field1249; Varcs() { this.unwrittenChanges = false; - int var1 = class288.archive2.getGroupFileCount(19); + int var1 = class2.archive2.getGroupFileCount(19); this.map = new HashMap(); this.intsPersistence = new boolean[var1]; int var2; for (var2 = 0; var2 < var1; ++var2) { - VarcInt var3 = class40.method778(var2); + VarcInt var3 = class215.method4012(var2); this.intsPersistence[var2] = var3.persist; } var2 = 0; - if (class288.archive2.method4355(15)) { - var2 = class288.archive2.getGroupFileCount(15); + if (class2.archive2.method4275(15)) { + var2 = class2.archive2.getGroupFileCount(15); } this.strings = new String[var2]; this.read(); } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "1927566504" + signature = "(IIB)V", + garbageValue = "3" ) @Export("setInt") void setInt(int var1, int var2) { @@ -66,10 +67,10 @@ public class Varcs { } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(II)I", - garbageValue = "-1918389063" + garbageValue = "-303157039" ) @Export("getInt") int getInt(int var1) { @@ -77,20 +78,20 @@ public class Varcs { return var2 instanceof Integer ? (Integer)var2 : -1; } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(ILjava/lang/String;I)V", - garbageValue = "1529993264" + signature = "(ILjava/lang/String;B)V", + garbageValue = "13" ) @Export("setString") void setString(int var1, String var2) { this.map.put(var1, var2); } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(II)Ljava/lang/String;", - garbageValue = "-2052988602" + signature = "(IB)Ljava/lang/String;", + garbageValue = "-14" ) @Export("getString") String getString(int var1) { @@ -98,30 +99,30 @@ public class Varcs { return var2 instanceof String ? (String)var2 : ""; } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(ILjava/lang/String;B)V", - garbageValue = "-38" + garbageValue = "-90" ) @Export("setStringOld") void setStringOld(int var1, String var2) { this.strings[var1] = var2; } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(IB)Ljava/lang/String;", - garbageValue = "-34" + signature = "(II)Ljava/lang/String;", + garbageValue = "1933750533" ) @Export("getStringOld") String getStringOld(int var1) { return this.strings[var1]; } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "996581962" + garbageValue = "2067478289" ) @Export("clearTransient") void clearTransient() { @@ -138,20 +139,20 @@ public class Varcs { } - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(ZB)Lmd;", - garbageValue = "59" + signature = "(ZI)Lmk;", + garbageValue = "2016445554" ) @Export("getPreferencesFile") AccessFile getPreferencesFile(boolean var1) { - return class191.getPreferencesFile("2", UserComparator8.field1973.name, var1); + return Messages.getPreferencesFile("2", AbstractWorldMapIcon.field284.name, var1); } - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1542947318" + signature = "(S)V", + garbageValue = "-9804" ) @Export("write") void write() { @@ -171,80 +172,81 @@ public class Varcs { if (var7 instanceof Integer) { var2 += 4; } else if (var7 instanceof String) { - var2 += class173.stringCp1252NullTerminatedByteSize((String)var7); + var2 += ViewportMouse.stringCp1252NullTerminatedByteSize((String)var7); } ++var3; } } - Buffer var27 = new Buffer(var2); - var27.writeByte(2); - var27.writeShort(var3); - Iterator var28 = this.map.entrySet().iterator(); + Buffer var28 = new Buffer(var2); + var28.writeByte(2); + var28.writeShort(var3); + Iterator var29 = this.map.entrySet().iterator(); - label148: + label147: while (true) { - Entry var16; - int var17; + Entry var17; + int var18; do { - if (!var28.hasNext()) { - var1.write(var27.array, 0, var27.offset); - break label148; + if (!var29.hasNext()) { + var1.write(var28.array, 0, var28.offset); + break label147; } - var16 = (Entry)var28.next(); - var17 = (Integer)var16.getKey(); - } while(!this.intsPersistence[var17]); + var17 = (Entry)var29.next(); + var18 = (Integer)var17.getKey(); + } while(!this.intsPersistence[var18]); - var27.writeShort(var17); - Object var8 = var16.getValue(); + var28.writeShort(var18); + Object var8 = var17.getValue(); Class var10 = var8.getClass(); - class3[] var11 = class3.method45(); - int var12 = 0; + class3[] var11 = new class3[]{class3.field19, class3.field9, class3.field10}; + class3[] var12 = var11; + int var13 = 0; class3 var9; while (true) { - if (var12 >= var11.length) { + if (var13 >= var12.length) { var9 = null; break; } - class3 var13 = var11[var12]; - if (var10 == var13.field16) { - var9 = var13; + class3 var14 = var12[var13]; + if (var10 == var14.field12) { + var9 = var14; break; } - ++var12; + ++var13; } - var27.writeByte(var9.field19); - class3.method37(var8, var27); + var28.writeByte(var9.field11); + class3.method36(var8, var28); } - } catch (Exception var25) { + } catch (Exception var26) { } finally { try { var1.close(); - } catch (Exception var24) { + } catch (Exception var25) { } } this.unwrittenChanges = false; - this.field1267 = TaskHandler.currentTimeMillis(); + this.field1249 = WorldMapID.currentTimeMillis(); } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "-21829" + signature = "(I)V", + garbageValue = "1379037686" ) @Export("read") void read() { AccessFile var1 = this.getPreferencesFile(false); - label224: { + label226: { try { byte[] var2 = new byte[(int)var1.length()]; @@ -256,67 +258,68 @@ public class Varcs { } } - Buffer var14 = new Buffer(var2); - if (var14.array.length - var14.offset < 1) { + Buffer var15 = new Buffer(var2); + if (var15.array.length - var15.offset < 1) { return; } - int var15 = var14.readUnsignedByte(); - if (var15 >= 0 && var15 <= 2) { + int var16 = var15.readUnsignedByte(); + if (var16 >= 0 && var16 <= 2) { int var7; int var8; int var9; - int var16; - if (var15 >= 2) { - var16 = var14.readUnsignedShort(); + int var17; + if (var16 >= 2) { + var17 = var15.readUnsignedShort(); var7 = 0; while (true) { - if (var7 >= var16) { - break label224; + if (var7 >= var17) { + break label226; } - var8 = var14.readUnsignedShort(); - var9 = var14.readUnsignedByte(); - class3 var10 = (class3)CollisionMap.findEnumerated(class3.method45(), var9); - Object var11 = var10.method40(var14); + var8 = var15.readUnsignedShort(); + var9 = var15.readUnsignedByte(); + class3[] var10 = new class3[]{class3.field19, class3.field9, class3.field10}; + class3 var11 = (class3)DynamicObject.findEnumerated(var10, var9); + Object var12 = var11.method38(var15); if (this.intsPersistence[var8]) { - this.map.put(var8, var11); + this.map.put(var8, var12); } ++var7; } } else { - var16 = var14.readUnsignedShort(); + var17 = var15.readUnsignedShort(); - for (var7 = 0; var7 < var16; ++var7) { - var8 = var14.readUnsignedShort(); - var9 = var14.readInt(); + for (var7 = 0; var7 < var17; ++var7) { + var8 = var15.readUnsignedShort(); + var9 = var15.readInt(); if (this.intsPersistence[var8]) { this.map.put(var8, var9); } } - var7 = var14.readUnsignedShort(); + var7 = var15.readUnsignedShort(); var8 = 0; while (true) { if (var8 >= var7) { - break label224; + break label226; } - var14.readUnsignedShort(); - var14.readStringCp1252NullTerminated(); + var15.readUnsignedShort(); + var15.readStringCp1252NullTerminated(); ++var8; } } } - } catch (Exception var25) { - break label224; + } catch (Exception var26) { + break label226; } finally { try { var1.close(); - } catch (Exception var24) { + } catch (Exception var25) { } } @@ -327,490 +330,71 @@ public class Varcs { this.unwrittenChanges = false; } - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1047394064" + signature = "(B)V", + garbageValue = "22" ) @Export("tryWrite") void tryWrite() { - if (this.unwrittenChanges && this.field1267 < TaskHandler.currentTimeMillis() - 60000L) { + if (this.unwrittenChanges && this.field1249 < WorldMapID.currentTimeMillis() - 60000L) { this.write(); } } - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "229746516" + garbageValue = "-68240792" ) @Export("hasUnwrittenChanges") boolean hasUnwrittenChanges() { return this.unwrittenChanges; } - @ObfuscatedName("u") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(IS)Lis;", - garbageValue = "200" + signature = "(IIIB)I", + garbageValue = "-58" ) - @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 int method2168(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("b") @ObfuscatedSignature( - signature = "(I)Lgx;", - garbageValue = "2098158571" + signature = "(II)Z", + garbageValue = "-49926633" ) - public static PacketBufferNode method2221() { - PacketBufferNode var0 = StudioGame.method4225(); - var0.clientPacket = null; - var0.clientPacketLength = 0; - var0.packetBuffer = new PacketBuffer(5000); - return var0; + public static boolean method2195(int var0) { + return (var0 >> 31 & 1) != 0; } - @ObfuscatedName("i") + @ObfuscatedName("kx") @ObfuscatedSignature( - signature = "(CI)Z", - garbageValue = "898966718" + signature = "(Lha;I)Z", + garbageValue = "180184458" ) - @Export("isAlphaNumeric") - public static boolean isAlphaNumeric(char var0) { - return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(ILci;ZI)I", - garbageValue = "2145599306" - ) - static int method2201(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var3 = Language.getWidget(Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]); - } else { - var3 = var2 ? Interpreter.field1090 : class188.field2352; - } - - String var4 = Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]; - int[] var5 = null; - if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { - int var6 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - if (var6 > 0) { - for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]) { - } - } - - 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[--class43.Interpreter_stringStackSize]; - } else { - var8[var7] = new Integer(Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]); - } - } - - var7 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.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.field2689 = var8; - } else { - if (var0 != ScriptOpcodes.CC_SETONRESIZE) { - return 2; - } - - var3.onResize = var8; - } - - var3.hasListener = true; - return 1; - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(ILci;ZB)I", - garbageValue = "-3" - ) - static int method2220(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? Interpreter.field1090 : class188.field2352; - if (var0 == ScriptOpcodes.CC_GETSCROLLX) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.scrollX; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.scrollY; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETTEXT) { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var3.text; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.scrollWidth; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.scrollHeight; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.modelZoom; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.modelAngleX; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.modelAngleZ; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.modelAngleY; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETTRANSTOP) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.transparencyTop; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETTRANSBOT) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.transparencyBot; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.color; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.color2; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETFILLMODE) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); - return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; - return 1; - } else { - return 2; - } - } - - @ObfuscatedName("av") - @ObfuscatedSignature( - signature = "(ILci;ZB)I", - garbageValue = "-27" - ) - static int method2194(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.LOGOUT) { - Client.logoutTimer = 250; - return 1; - } else { - return 2; - } - } - - @ObfuscatedName("ga") - @ObfuscatedSignature( - signature = "(Lbg;ZI)V", - garbageValue = "-1731011436" - ) - @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 = MouseHandler.calculateTag(0, 0, 0, false, var0.index); - if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { - var0.isUnanimated = false; - var0.tileHeight = class195.getTileHeight(var0.x, var0.y, ClientPacket.Client_plane); - var0.playerCycle = Client.cycle; - class2.scene.addNullableObject(ClientPacket.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.field618, var0.field620, var0.field621, var0.field622); - } 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 = class195.getTileHeight(var0.x, var0.y, ClientPacket.Client_plane); - var0.playerCycle = Client.cycle; - class2.scene.drawEntity(ClientPacket.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); - } - } - } - - } - - @ObfuscatedName("ig") - @ObfuscatedSignature( - signature = "(IIIIB)V", - garbageValue = "-19" - ) - @Export("addSceneMenuOptions") - static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { - if (Client.isItemSelected == 0 && !Client.isSpellSelected) { - WorldMapSprite.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 = WorldMapSectionType.method271(var4); - Player var11 = Client.players[Client.combatTargetPlayerIndex]; - Entity.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var10); - } - - return; - } - - long var25 = SoundCache.method2531(var8); - if (var25 != var6) { - label333: { - var6 = var25; - int var13 = HealthBarUpdate.ViewportMouse_unpackX(var8); - int var14 = GrandExchangeOfferUnitPriceComparator.method143(var8); - long var17 = ViewportMouse.ViewportMouse_entityTags[var8]; - int var16 = (int)(var17 >>> 14 & 3L); - int var27 = ItemContainer.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var8]); - int var18 = var27; - if (var16 == 2 && class2.scene.getObjectFlags(ClientPacket.Client_plane, var13, var14, var25) >= 0) { - ObjectDefinition var19 = Occluder.getObjectDefinition(var27); - if (var19.transforms != null) { - var19 = var19.transform(); - } - - if (var19 == null) { - break label333; - } - - if (Client.isItemSelected == 1) { - WorldMapSprite.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class222.colorStartTag(65535) + var19.name, 1, var27, var13, var14); - } else if (Client.isSpellSelected) { - if ((Actor.selectedSpellFlags & 4) == 4) { - WorldMapSprite.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class222.colorStartTag(65535) + var19.name, 2, var27, var13, var14); - } - } else { - String[] var28 = var19.actions; - if (var28 != null) { - for (int var31 = 4; var31 >= 0; --var31) { - if (var28[var31] != null) { - short var22 = 0; - if (var31 == 0) { - var22 = 3; - } - - if (var31 == 1) { - var22 = 4; - } - - if (var31 == 2) { - var22 = 5; - } - - if (var31 == 3) { - var22 = 6; - } - - if (var31 == 4) { - var22 = 1001; - } - - WorldMapSprite.insertMenuItemNoShift(var28[var31], class222.colorStartTag(65535) + var19.name, var22, var18, var13, var14); - } - } - } - - WorldMapSprite.insertMenuItemNoShift("Examine", class222.colorStartTag(65535) + var19.name, 1002, var19.id, var13, var14); - } - } - - int var20; - NPC var21; - Player var23; - int[] var35; - int var37; - if (var16 == 1) { - NPC var32 = Client.npcs[var18]; - if (var32 == null) { - break label333; - } - - if (var32.definition.size == 1 && (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 != var32 && var21.definition.size == 1 && var21.x == var32.x && var32.y == var21.y) { - LoginPacket.addNpcToMenu(var21.definition, Client.npcIndices[var20], var13, var14); - } - } - - var20 = Players.Players_count; - var35 = Players.Players_indices; - - for (var37 = 0; var37 < var20; ++var37) { - var23 = Client.players[var35[var37]]; - if (var23 != null && var23.x == var32.x && var23.y == var32.y) { - Entity.addPlayerToMenu(var23, var35[var37], var13, var14); - } - } - } - - LoginPacket.addNpcToMenu(var32.definition, var18, var13, var14); - } - - if (var16 == 0) { - Player var33 = Client.players[var18]; - if (var33 == null) { - break label333; - } - - if ((var33.x & 127) == 64 && (var33.y & 127) == 64) { - for (var20 = 0; var20 < Client.npcCount; ++var20) { - var21 = Client.npcs[Client.npcIndices[var20]]; - if (var21 != null && var21.definition.size == 1 && var33.x == var21.x && var21.y == var33.y) { - LoginPacket.addNpcToMenu(var21.definition, Client.npcIndices[var20], var13, var14); - } - } - - var20 = Players.Players_count; - var35 = Players.Players_indices; - - for (var37 = 0; var37 < var20; ++var37) { - var23 = Client.players[var35[var37]]; - if (var23 != null && var33 != var23 && var33.x == var23.x && var23.y == var33.y) { - Entity.addPlayerToMenu(var23, var35[var37], var13, var14); - } - } - } - - if (var18 != Client.combatTargetPlayerIndex) { - Entity.addPlayerToMenu(var33, var18, var13, var14); - } else { - var4 = var25; - } - } - - if (var16 == 3) { - NodeDeque var34 = Client.groundItems[ClientPacket.Client_plane][var13][var14]; - if (var34 != null) { - for (TileItem var38 = (TileItem)var34.first(); var38 != null; var38 = (TileItem)var34.next()) { - ItemDefinition var36 = Interpreter.ItemDefinition_get(var38.id); - if (Client.isItemSelected == 1) { - WorldMapSprite.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class222.colorStartTag(16748608) + var36.name, 16, var38.id, var13, var14); - } else if (Client.isSpellSelected) { - if ((Actor.selectedSpellFlags & 1) == 1) { - WorldMapSprite.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class222.colorStartTag(16748608) + var36.name, 17, var38.id, var13, var14); - } - } else { - String[] var29 = var36.groundActions; - - for (int var30 = 4; var30 >= 0; --var30) { - if (var29 != null && var29[var30] != null) { - byte var24 = 0; - if (var30 == 0) { - var24 = 18; - } - - if (var30 == 1) { - var24 = 19; - } - - if (var30 == 2) { - var24 = 20; - } - - if (var30 == 3) { - var24 = 21; - } - - if (var30 == 4) { - var24 = 22; - } - - WorldMapSprite.insertMenuItemNoShift(var29[var30], class222.colorStartTag(16748608) + var36.name, var24, var38.id, var13, var14); - } else if (var30 == 2) { - WorldMapSprite.insertMenuItemNoShift("Take", class222.colorStartTag(16748608) + var36.name, 20, var38.id, var13, var14); - } - } - - WorldMapSprite.insertMenuItemNoShift("Examine", class222.colorStartTag(16748608) + var36.name, 1004, var38.id, var13, var14); - } - } - } - } - } - } - - ++var8; - } + @Export("isComponentHidden") + static boolean isComponentHidden(Widget var0) { + return var0.isHidden; } } diff --git a/runescape-client/src/main/java/VarpDefinition.java b/runescape-client/src/main/java/VarpDefinition.java index 9185693830..4e9fff5231 100644 --- a/runescape-client/src/main/java/VarpDefinition.java +++ b/runescape-client/src/main/java/VarpDefinition.java @@ -3,31 +3,32 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ib") +@ObfuscatedName("im") @Implements("VarpDefinition") public class VarpDefinition extends DualNode { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lhf;" + signature = "Lhz;" ) @Export("VarpDefinition_archive") - public static AbstractArchive VarpDefinition_archive; - @ObfuscatedName("f") + static AbstractArchive VarpDefinition_archive; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1363987461 + intValue = 187888889 ) @Export("VarpDefinition_fileCount") public static int VarpDefinition_fileCount; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lef;" + signature = "Leb;" ) @Export("VarpDefinition_cached") static EvictingDualNodeHashTable VarpDefinition_cached; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 2147120887 + intValue = 2035437867 ) @Export("type") public int type; @@ -40,10 +41,10 @@ public class VarpDefinition extends DualNode { this.type = 0; } - @ObfuscatedName("f") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Lkg;I)V", - garbageValue = "1343549927" + signature = "(Lkq;B)V", + garbageValue = "99" ) @Export("decode") void decode(Buffer var1) { @@ -57,10 +58,10 @@ public class VarpDefinition extends DualNode { } } - @ObfuscatedName("b") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lkg;II)V", - garbageValue = "1561569314" + signature = "(Lkq;II)V", + garbageValue = "1805954693" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -69,4 +70,75 @@ public class VarpDefinition extends DualNode { } } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + signature = "(ILcu;ZI)I", + garbageValue = "1208148197" + ) + static int method4347(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { + class188.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + int var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + if (!Client.isCameraLocked) { + Client.camAngleX = var3; + Client.camAngleY = var4; + } + + return 1; + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.camAngleX; + return 1; + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.camAngleY; + return 1; + } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + if (var3 < 0) { + var3 = 0; + } + + Client.camFollowHeight = var3; + return 1; + } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.camFollowHeight; + return 1; + } else { + return 2; + } + } + + @ObfuscatedName("ko") + @ObfuscatedSignature( + signature = "(Lbz;ZS)V", + garbageValue = "-3532" + ) + @Export("closeInterface") + static final void closeInterface(InterfaceParent var0, boolean var1) { + int var2 = var0.group; + int var3 = (int)var0.key; + var0.remove(); + if (var1) { + ItemDefinition.method4715(var2); + } + + for (IntegerNode var4 = (IntegerNode)Client.widgetClickMasks.first(); var4 != null; var4 = (IntegerNode)Client.widgetClickMasks.next()) { + if ((long)var2 == (var4.key >> 48 & 65535L)) { + var4.remove(); + } + } + + Widget var5 = Tile.getWidget(var3); + if (var5 != null) { + LoginPacket.invalidateWidget(var5); + } + + Strings.method4096(); + if (Client.rootInterface != -1) { + ItemContainer.runIntfCloseListeners(Client.rootInterface, 1); + } + + } } diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java index e8d522040d..1be2e7741e 100644 --- a/runescape-client/src/main/java/Varps.java +++ b/runescape-client/src/main/java/Varps.java @@ -1,32 +1,38 @@ 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("hm") +@ObfuscatedName("hu") @Implements("Varps") public class Varps { - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("Varps_masks") static int[] Varps_masks; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("Varps_temp") public static int[] Varps_temp; - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("Varps_main") public static int[] Varps_main; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Llm;" + signature = "Lfc;" ) - @Export("options_buttons_2Sprite") - static IndexedSprite options_buttons_2Sprite; - @ObfuscatedName("di") - @ObfuscatedGetter( - longValue = 9031860533713930289L + @Export("clock") + static Clock clock; + @ObfuscatedName("by") + @ObfuscatedSignature( + signature = "Lgs;" ) - static long field2533; + @Export("clientLanguage") + static Language clientLanguage; + @ObfuscatedName("gh") + @ObfuscatedSignature( + signature = "[Lls;" + ) + @Export("mapMarkerSprites") + static Sprite[] mapMarkerSprites; static { Varps_masks = new int[32]; @@ -40,65 +46,4 @@ public class Varps { Varps_temp = new int[4000]; Varps_main = new int[4000]; } - - @ObfuscatedName("hl") - @ObfuscatedSignature( - signature = "(IIIIIIIIII)V", - garbageValue = "1896551427" - ) - @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; - class215.method4108(var9); - Client.pendingSpawns.addFirst(var9); - } - - var9.id = var4; - var9.field927 = var5; - var9.orientation = var6; - var9.delay = var7; - var9.hitpoints = var8; - } - - @ObfuscatedName("ia") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "1" - ) - static void method4043() { - for (int var0 = 0; var0 < Client.menuOptionsCount; ++var0) { - if (class96.method2315(Client.menuOpcodes[var0])) { - if (var0 < Client.menuOptionsCount - 1) { - for (int var1 = var0; var1 < Client.menuOptionsCount - 1; ++var1) { - Client.menuActions[var1] = Client.menuActions[var1 + 1]; - Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; - Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; - Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; - Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; - Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; - Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; - } - } - - --var0; - --Client.menuOptionsCount; - } - } - - MouseHandler.calculateMenuBounds(TileItemPile.menuWidth / 2 + HealthBar.menuX, class191.menuY); - } } diff --git a/runescape-client/src/main/java/VertexNormal.java b/runescape-client/src/main/java/VertexNormal.java index 602f7f3fd2..5a3e319adf 100644 --- a/runescape-client/src/main/java/VertexNormal.java +++ b/runescape-client/src/main/java/VertexNormal.java @@ -4,36 +4,46 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dy") +@ObfuscatedName("dm") @Implements("VertexNormal") public class VertexNormal { - @ObfuscatedName("rp") - @ObfuscatedSignature( - signature = "Lbz;" - ) - @Export("friendSystem") - public static FriendSystem friendSystem; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1950560399 + intValue = -914762705 + ) + @Export("cacheGamebuild") + static int cacheGamebuild; + @ObfuscatedName("cx") + @ObfuscatedGetter( + intValue = -435303731 + ) + public static int field1732; + @ObfuscatedName("fq") + @ObfuscatedSignature( + signature = "Lky;" + ) + static AbstractSocket field1730; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 2142857667 ) @Export("x") int x; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1465831069 + intValue = -62403169 ) @Export("y") int y; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1066205161 + intValue = -2087129489 ) @Export("z") int z; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -600292875 + intValue = 1861306347 ) @Export("magnitude") int magnitude; @@ -42,7 +52,7 @@ public class VertexNormal { } @ObfuscatedSignature( - signature = "(Ldy;)V" + signature = "(Ldm;)V" ) VertexNormal(VertexNormal var1) { this.x = var1.x; @@ -51,159 +61,21 @@ public class VertexNormal { this.magnitude = var1.magnitude; } - @ObfuscatedName("y") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lkg;J)V" + signature = "(I)V", + garbageValue = "-1271488083" ) - static void method3019(Buffer var0, long var1) { - var1 /= 10L; - if (var1 < 0L) { - var1 = 0L; - } else if (var1 > 65535L) { - var1 = 65535L; - } - - var0.writeShort((int)var1); + static final void method2996() { + Tiles.method1143("Your ignore list is full. Max of 100 for free users, and 400 for members"); } - @ObfuscatedName("x") + @ObfuscatedName("kj") @ObfuscatedSignature( - signature = "(IIIIIZI)Lln;", - garbageValue = "2136312432" + signature = "(B)V", + garbageValue = "-68" ) - @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)var0 + ((long)var1 << 16) + ((long)var2 << 38); - Sprite var8; - if (!var5) { - var8 = (Sprite)ItemDefinition.ItemDefinition_cachedSprites.get(var6); - if (var8 != null) { - return var8; - } - } - - ItemDefinition var9 = Interpreter.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 = Interpreter.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.method3024(16, 16); - Rasterizer3D.field1750 = false; - if (var9.placeholderTemplate != -1) { - var20.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; - var19.calculateBoundsCylinder(); - var19.method2958(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) { - class335.ItemDefinition_fontPlain11.draw(WorldMapAreaData.method711(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.field1750 = true; - return var8; - } - } - - @ObfuscatedName("lb") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "-710411127" - ) - static String method3017(String var0) { - PlayerType[] var1 = class2.PlayerType_values(); - - for (int var2 = 0; var2 < var1.length; ++var2) { - PlayerType var3 = var1[var2]; - if (var3.modIcon != -1 && var0.startsWith(Client.method1749(var3.modIcon))) { - var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); - break; - } - } - - return var0; + static final void method2995() { + Client.field711 = Client.cycleCntr; } } diff --git a/runescape-client/src/main/java/VerticalAlignment.java b/runescape-client/src/main/java/VerticalAlignment.java index e3969a4e63..b853864dc5 100644 --- a/runescape-client/src/main/java/VerticalAlignment.java +++ b/runescape-client/src/main/java/VerticalAlignment.java @@ -4,38 +4,35 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ik") +@ObfuscatedName("ia") @Implements("VerticalAlignment") public enum VerticalAlignment implements Enumerated { - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lik;" - ) - field3201(2, 0), @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lik;" + signature = "Lia;" + ) + field3170(0, 0), + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "Lia;" ) @Export("VerticalAlignment_centered") VerticalAlignment_centered(1, 1), - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lik;" + signature = "Lia;" ) - field3200(0, 2); + field3169(2, 2); - @ObfuscatedName("gh") - @Export("regionLandArchives") - static byte[][] regionLandArchives; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 445419169 + intValue = -282491713 ) @Export("value") public final int value; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1195481175 + intValue = -1884067313 ) @Export("id") final int id; @@ -45,13 +42,22 @@ public enum VerticalAlignment implements Enumerated { this.id = var4; } - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "7" + garbageValue = "-57" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } + + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "(Ljava/lang/CharSequence;II)I", + garbageValue = "1663251439" + ) + public static int method4326(CharSequence var0, int var1) { + return TriBool.parseIntCustomRadix(var0, var1, true); + } } diff --git a/runescape-client/src/main/java/ViewportMouse.java b/runescape-client/src/main/java/ViewportMouse.java index 049983b8db..00480af28a 100644 --- a/runescape-client/src/main/java/ViewportMouse.java +++ b/runescape-client/src/main/java/ViewportMouse.java @@ -4,46 +4,62 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dd") +@ObfuscatedName("dz") @Implements("ViewportMouse") public class ViewportMouse { - @ObfuscatedName("u") - @Export("ViewportMouse_isInViewport") - static boolean ViewportMouse_isInViewport; @ObfuscatedName("f") + @Export("ViewportMouse_isInViewport") + public static boolean ViewportMouse_isInViewport; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 2136731005 + intValue = -52069035 ) @Export("ViewportMouse_x") - static int ViewportMouse_x; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = -1807081523 - ) - @Export("ViewportMouse_y") - static int ViewportMouse_y; - @ObfuscatedName("g") - @Export("ViewportMouse_false0") - static boolean ViewportMouse_false0; + public static int ViewportMouse_x; @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 998794847 + intValue = -819033673 ) - static int field1737; + @Export("ViewportMouse_y") + public static int ViewportMouse_y; @ObfuscatedName("w") + @Export("ViewportMouse_false0") + public static boolean ViewportMouse_false0; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 529684695 + intValue = 945572255 ) - static int field1739; + static int field1717; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 421048203 + intValue = -45541993 + ) + static int field1718; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -1585979181 + ) + static int field1719; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -1002877627 + ) + static int field1720; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 1949057711 ) @Export("ViewportMouse_entityCount") public static int ViewportMouse_entityCount; - @ObfuscatedName("n") + @ObfuscatedName("s") @Export("ViewportMouse_entityTags") public static long[] ViewportMouse_entityTags; + @ObfuscatedName("hb") + @ObfuscatedGetter( + intValue = -1167251555 + ) + @Export("cameraPitch") + static int cameraPitch; static { ViewportMouse_isInViewport = false; @@ -54,23 +70,26 @@ public class ViewportMouse { ViewportMouse_entityTags = new long[1000]; } - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(ZZI)I", - garbageValue = "-1821844574" + signature = "(II)I", + garbageValue = "1626465516" ) - public static int method3015(boolean var0, boolean var1) { - byte var2 = 0; - int var3 = var2 + NetCache.NetCache_pendingPriorityResponsesCount + NetCache.NetCache_pendingPriorityWritesCount; - return var3; + public static int method2993(int var0) { + if (var0 > 0) { + return 1; + } else { + return var0 < 0 ? -1 : 0; + } } - @ObfuscatedName("y") + @ObfuscatedName("bg") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-950495199" + signature = "(Ljava/lang/String;B)I", + garbageValue = "-8" ) - public static void method3012() { - StructDefinition.StructDefinition_cached.clear(); + @Export("stringCp1252NullTerminatedByteSize") + public static int stringCp1252NullTerminatedByteSize(String var0) { + return var0.length() + 1; } } diff --git a/runescape-client/src/main/java/VorbisCodebook.java b/runescape-client/src/main/java/VorbisCodebook.java index 102f0b265a..dab773c45b 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("cx") +@ObfuscatedName("cm") @Implements("VorbisCodebook") public class VorbisCodebook { - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("dimensions") int dimensions; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("entries") int entries; - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("lengthMap") int[] lengthMap; - @ObfuscatedName("g") - int[] field1333; - @ObfuscatedName("z") - float[][] field1334; + @ObfuscatedName("w") + int[] field1312; @ObfuscatedName("p") + float[][] field1310; + @ObfuscatedName("b") @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(class160.iLog(this.entries - var2)); + int var4 = VorbisSample.readBits(Frames.iLog(this.entries - var2)); for (var5 = 0; var5 < var4; ++var5) { this.lengthMap[var2++] = var3; @@ -53,7 +53,7 @@ public class VorbisCodebook { } } - this.method2358(); + this.method2341(); 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.field1333 = new int[var7]; + this.field1312 = new int[var7]; int var8; for (var8 = 0; var8 < var7; ++var8) { - this.field1333[var8] = VorbisSample.readBits(var5); + this.field1312[var8] = VorbisSample.readBits(var5); } - this.field1334 = new float[this.entries][this.dimensions]; + this.field1310 = 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.field1333[var12] * var16 + var15 + var9; - this.field1334[var8][var11] = var13; + float var13 = (float)this.field1312[var12] * var16 + var15 + var9; + this.field1310[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.field1333[var10] * var16 + var15 + var9; - this.field1334[var8][var11] = var17; + float var17 = (float)this.field1312[var10] * var16 + var15 + var9; + this.field1310[var8][var11] = var17; if (var6) { var9 = var17; } @@ -114,8 +114,8 @@ public class VorbisCodebook { } - @ObfuscatedName("f") - void method2358() { + @ObfuscatedName("i") + void method2341() { int[] var1 = new int[this.entries]; int[] var2 = new int[33]; @@ -208,8 +208,8 @@ public class VorbisCodebook { } - @ObfuscatedName("b") - int method2356() { + @ObfuscatedName("y") + int method2342() { int var1; for (var1 = 0; this.keys[var1] >= 0; var1 = VorbisSample.readBit() != 0 ? this.keys[var1] : var1 + 1) { } @@ -217,41 +217,18 @@ public class VorbisCodebook { return ~this.keys[var1]; } - @ObfuscatedName("g") - float[] method2357() { - return this.field1334[this.method2356()]; + @ObfuscatedName("w") + float[] method2349() { + return this.field1310[this.method2342()]; } - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("mapType1QuantValues") static int mapType1QuantValues(int var0, int var1) { - int var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; - - 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; + int var2; + for (var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; ModelData0.method3266(var2, var1) > var0; --var2) { } + + return var2; } } diff --git a/runescape-client/src/main/java/VorbisFloor.java b/runescape-client/src/main/java/VorbisFloor.java index 1fea908057..ca164669e1 100644 --- a/runescape-client/src/main/java/VorbisFloor.java +++ b/runescape-client/src/main/java/VorbisFloor.java @@ -2,43 +2,43 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("dw") +@ObfuscatedName("cv") @Implements("VorbisFloor") public class VorbisFloor { - @ObfuscatedName("u") - static final int[] field1381; @ObfuscatedName("f") + static final int[] field1358; + @ObfuscatedName("i") @Export("VorbisFloor_decibelStatics") static final float[] VorbisFloor_decibelStatics; - @ObfuscatedName("i") - static int[] field1380; - @ObfuscatedName("k") - static int[] field1389; - @ObfuscatedName("x") - static boolean[] field1390; - @ObfuscatedName("b") - int[] field1388; - @ObfuscatedName("g") + @ObfuscatedName("d") + static int[] field1359; + @ObfuscatedName("c") + static int[] field1366; + @ObfuscatedName("o") + static boolean[] field1367; + @ObfuscatedName("y") + int[] field1365; + @ObfuscatedName("w") @Export("multiplier") int multiplier; - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("partitionClassList") int[] partitionClassList; - @ObfuscatedName("p") + @ObfuscatedName("b") @Export("classDimensions") int[] classDimensions; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("classSubClasses") int[] classSubClasses; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("classMasterbooks") int[] classMasterbooks; - @ObfuscatedName("w") + @ObfuscatedName("a") @Export("subclassBooks") int[][] subclassBooks; static { - field1381 = new int[]{256, 128, 86, 64}; + field1358 = new int[]{256, 128, 86, 64}; VorbisFloor_decibelStatics = new float[]{1.0649863E-7F, 1.1341951E-7F, 1.2079015E-7F, 1.2863978E-7F, 1.369995E-7F, 1.459025E-7F, 1.5538409E-7F, 1.6548181E-7F, 1.7623574E-7F, 1.8768856E-7F, 1.998856E-7F, 2.128753E-7F, 2.2670913E-7F, 2.4144197E-7F, 2.5713223E-7F, 2.7384212E-7F, 2.9163792E-7F, 3.1059022E-7F, 3.307741E-7F, 3.5226967E-7F, 3.7516213E-7F, 3.995423E-7F, 4.255068E-7F, 4.5315863E-7F, 4.8260745E-7F, 5.1397E-7F, 5.4737063E-7F, 5.829419E-7F, 6.208247E-7F, 6.611694E-7F, 7.041359E-7F, 7.4989464E-7F, 7.98627E-7F, 8.505263E-7F, 9.057983E-7F, 9.646621E-7F, 1.0273513E-6F, 1.0941144E-6F, 1.1652161E-6F, 1.2409384E-6F, 1.3215816E-6F, 1.4074654E-6F, 1.4989305E-6F, 1.5963394E-6F, 1.7000785E-6F, 1.8105592E-6F, 1.9282195E-6F, 2.053526E-6F, 2.1869757E-6F, 2.3290977E-6F, 2.4804558E-6F, 2.6416496E-6F, 2.813319E-6F, 2.9961443E-6F, 3.1908505E-6F, 3.39821E-6F, 3.619045E-6F, 3.8542307E-6F, 4.1047006E-6F, 4.371447E-6F, 4.6555283E-6F, 4.958071E-6F, 5.280274E-6F, 5.623416E-6F, 5.988857E-6F, 6.3780467E-6F, 6.7925284E-6F, 7.2339453E-6F, 7.704048E-6F, 8.2047E-6F, 8.737888E-6F, 9.305725E-6F, 9.910464E-6F, 1.0554501E-5F, 1.1240392E-5F, 1.1970856E-5F, 1.2748789E-5F, 1.3577278E-5F, 1.4459606E-5F, 1.5399271E-5F, 1.6400005E-5F, 1.7465769E-5F, 1.8600793E-5F, 1.9809577E-5F, 2.1096914E-5F, 2.2467912E-5F, 2.3928002E-5F, 2.5482977E-5F, 2.7139005E-5F, 2.890265E-5F, 3.078091E-5F, 3.2781227E-5F, 3.4911533E-5F, 3.718028E-5F, 3.9596467E-5F, 4.2169668E-5F, 4.491009E-5F, 4.7828602E-5F, 5.0936775E-5F, 5.424693E-5F, 5.7772202E-5F, 6.152657E-5F, 6.552491E-5F, 6.9783084E-5F, 7.4317984E-5F, 7.914758E-5F, 8.429104E-5F, 8.976875E-5F, 9.560242E-5F, 1.0181521E-4F, 1.0843174E-4F, 1.1547824E-4F, 1.2298267E-4F, 1.3097477E-4F, 1.3948625E-4F, 1.4855085E-4F, 1.5820454E-4F, 1.6848555E-4F, 1.7943469E-4F, 1.9109536E-4F, 2.0351382E-4F, 2.167393E-4F, 2.3082423E-4F, 2.4582449E-4F, 2.6179955E-4F, 2.7881275E-4F, 2.9693157E-4F, 3.1622787E-4F, 3.3677815E-4F, 3.5866388E-4F, 3.8197188E-4F, 4.0679457E-4F, 4.3323037E-4F, 4.613841E-4F, 4.913675E-4F, 5.2329927E-4F, 5.573062E-4F, 5.935231E-4F, 6.320936E-4F, 6.731706E-4F, 7.16917E-4F, 7.635063E-4F, 8.1312325E-4F, 8.6596457E-4F, 9.2223985E-4F, 9.821722E-4F, 0.0010459992F, 0.0011139743F, 0.0011863665F, 0.0012634633F, 0.0013455702F, 0.0014330129F, 0.0015261382F, 0.0016253153F, 0.0017309374F, 0.0018434235F, 0.0019632196F, 0.0020908006F, 0.0022266726F, 0.0023713743F, 0.0025254795F, 0.0026895993F, 0.0028643848F, 0.0030505287F, 0.003248769F, 0.0034598925F, 0.0036847359F, 0.0039241905F, 0.0041792067F, 0.004450795F, 0.004740033F, 0.005048067F, 0.0053761187F, 0.005725489F, 0.0060975635F, 0.0064938175F, 0.0069158226F, 0.0073652514F, 0.007843887F, 0.008353627F, 0.008896492F, 0.009474637F, 0.010090352F, 0.01074608F, 0.011444421F, 0.012188144F, 0.012980198F, 0.013823725F, 0.014722068F, 0.015678791F, 0.016697686F, 0.017782796F, 0.018938422F, 0.020169148F, 0.021479854F, 0.022875736F, 0.02436233F, 0.025945531F, 0.027631618F, 0.029427277F, 0.031339627F, 0.03337625F, 0.035545226F, 0.037855156F, 0.0403152F, 0.042935107F, 0.045725275F, 0.048696756F, 0.05186135F, 0.05523159F, 0.05882085F, 0.062643364F, 0.06671428F, 0.07104975F, 0.075666964F, 0.08058423F, 0.08582105F, 0.09139818F, 0.097337745F, 0.1036633F, 0.11039993F, 0.11757434F, 0.12521498F, 0.13335215F, 0.14201812F, 0.15124726F, 0.16107617F, 0.1715438F, 0.18269168F, 0.19456401F, 0.20720787F, 0.22067343F, 0.23501402F, 0.25028655F, 0.26655158F, 0.28387362F, 0.3023213F, 0.32196787F, 0.34289113F, 0.36517414F, 0.3889052F, 0.41417846F, 0.44109413F, 0.4697589F, 0.50028646F, 0.53279793F, 0.5674221F, 0.6042964F, 0.64356697F, 0.6853896F, 0.72993004F, 0.777365F, 0.8278826F, 0.88168305F, 0.9389798F, 1.0F}; } @@ -92,30 +92,30 @@ public class VorbisFloor { var5 += this.classDimensions[this.partitionClassList[var9]]; } - this.field1388 = new int[var5]; - this.field1388[0] = 0; - this.field1388[1] = 1 << var4; + this.field1365 = new int[var5]; + this.field1365[0] = 0; + this.field1365[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.field1388[var5++] = VorbisSample.readBits(var4); + this.field1365[var5++] = VorbisSample.readBits(var4); } } - if (field1380 == null || field1380.length < var5) { - field1380 = new int[var5]; - field1389 = new int[var5]; - field1390 = new boolean[var5]; + if (field1359 == null || field1359.length < var5) { + field1359 = new int[var5]; + field1366 = new int[var5]; + field1367 = new boolean[var5]; } } } - @ObfuscatedName("b") - int method2423(int var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("y") + int method2402(int var1, int var2, int var3, int var4, int var5) { int var6 = var4 - var2; int var7 = var3 - var1; int var8 = var6 < 0 ? -var6 : var6; @@ -124,8 +124,8 @@ public class VorbisFloor { return var6 < 0 ? var2 - var10 : var10 + var2; } - @ObfuscatedName("g") - void method2424(int var1, int var2, int var3, int var4, float[] var5, int var6) { + @ObfuscatedName("w") + void method2403(int var1, int var2, int var3, int var4, float[] var5, int var6) { int var7 = var4 - var2; int var8 = var3 - var1; int var9 = var7 < 0 ? -var7 : var7; @@ -153,54 +153,54 @@ public class VorbisFloor { } - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("VarbisFloor_sort") void VarbisFloor_sort(int var1, int var2) { if (var1 < var2) { int var3 = var1; - int var4 = field1380[var1]; - int var5 = field1389[var1]; - boolean var6 = field1390[var1]; + int var4 = field1359[var1]; + int var5 = field1366[var1]; + boolean var6 = field1367[var1]; for (int var7 = var1 + 1; var7 <= var2; ++var7) { - int var8 = field1380[var7]; + int var8 = field1359[var7]; if (var8 < var4) { - field1380[var3] = var8; - field1389[var3] = field1389[var7]; - field1390[var3] = field1390[var7]; + field1359[var3] = var8; + field1366[var3] = field1366[var7]; + field1367[var3] = field1367[var7]; ++var3; - field1380[var7] = field1380[var3]; - field1389[var7] = field1389[var3]; - field1390[var7] = field1390[var3]; + field1359[var7] = field1359[var3]; + field1366[var7] = field1366[var3]; + field1367[var7] = field1367[var3]; } } - field1380[var3] = var4; - field1389[var3] = var5; - field1390[var3] = var6; + field1359[var3] = var4; + field1366[var3] = var5; + field1367[var3] = var6; this.VarbisFloor_sort(var1, var3 - 1); this.VarbisFloor_sort(var3 + 1, var2); } } - @ObfuscatedName("p") + @ObfuscatedName("b") @Export("readSubmapFloor") boolean readSubmapFloor() { boolean var1 = VorbisSample.readBit() != 0; if (!var1) { return false; } else { - int var2 = this.field1388.length; + int var2 = this.field1365.length; int var3; for (var3 = 0; var3 < var2; ++var3) { - field1380[var3] = this.field1388[var3]; + field1359[var3] = this.field1365[var3]; } - var3 = field1381[this.multiplier - 1]; - int var4 = class160.iLog(var3 - 1); - field1389[0] = VorbisSample.readBits(var4); - field1389[1] = VorbisSample.readBits(var4); + var3 = field1358[this.multiplier - 1]; + int var4 = Frames.iLog(var3 - 1); + field1366[0] = VorbisSample.readBits(var4); + field1366[1] = VorbisSample.readBits(var4); int var5 = 2; for (int var6 = 0; var6 < this.partitionClassList.length; ++var6) { @@ -210,13 +210,13 @@ public class VorbisFloor { int var10 = (1 << var9) - 1; int var11 = 0; if (var9 > 0) { - var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method2356(); + var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method2342(); } for (int var12 = 0; var12 < var8; ++var12) { int var13 = this.subclassBooks[var7][var11 & var10]; var11 >>>= var9; - field1389[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method2356() : 0; + field1366[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method2342() : 0; } } @@ -224,12 +224,12 @@ public class VorbisFloor { } } - @ObfuscatedName("h") - void method2436(float[] var1, int var2) { - int var3 = this.field1388.length; - int var4 = field1381[this.multiplier - 1]; - boolean[] var5 = field1390; - field1390[1] = true; + @ObfuscatedName("e") + void method2405(float[] var1, int var2) { + int var3 = this.field1365.length; + int var4 = field1358[this.multiplier - 1]; + boolean[] var5 = field1367; + field1367[1] = true; var5[0] = true; int var6; @@ -238,37 +238,37 @@ public class VorbisFloor { int var9; int var10; for (var6 = 2; var6 < var3; ++var6) { - var7 = method2433(field1380, var6); - var8 = method2422(field1380, var6); - var9 = this.method2423(field1380[var7], field1389[var7], field1380[var8], field1389[var8], field1380[var6]); - var10 = field1389[var6]; + var7 = method2419(field1359, var6); + var8 = method2401(field1359, var6); + var9 = this.method2402(field1359[var7], field1366[var7], field1359[var8], field1366[var8], field1359[var6]); + var10 = field1366[var6]; int var11 = var4 - var9; int var13 = (var11 < var9 ? var11 : var9) << 1; if (var10 != 0) { - boolean[] var14 = field1390; - field1390[var8] = true; + boolean[] var14 = field1367; + field1367[var8] = true; var14[var7] = true; - field1390[var6] = true; + field1367[var6] = true; if (var10 >= var13) { - field1389[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; + field1366[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; } else { - field1389[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; + field1366[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; } } else { - field1390[var6] = false; - field1389[var6] = var9; + field1367[var6] = false; + field1366[var6] = var9; } } this.VarbisFloor_sort(0, var3 - 1); var6 = 0; - var7 = field1389[0] * this.multiplier; + var7 = field1366[0] * this.multiplier; for (var8 = 1; var8 < var3; ++var8) { - if (field1390[var8]) { - var9 = field1380[var8]; - var10 = field1389[var8] * this.multiplier; - this.method2424(var6, var7, var9, var10, var1, var2); + if (field1367[var8]) { + var9 = field1359[var8]; + var10 = field1366[var8] * this.multiplier; + this.method2403(var6, var7, var9, var10, var1, var2); if (var9 >= var2) { return; } @@ -286,8 +286,8 @@ public class VorbisFloor { } - @ObfuscatedName("u") - static int method2433(int[] var0, int var1) { + @ObfuscatedName("f") + static int method2419(int[] var0, int var1) { int var2 = var0[var1]; int var3 = -1; int var4 = Integer.MIN_VALUE; @@ -303,8 +303,8 @@ public class VorbisFloor { return var3; } - @ObfuscatedName("f") - static int method2422(int[] var0, int var1) { + @ObfuscatedName("i") + static int method2401(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 3a93514b5e..0c5a60f87b 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("dz") +@ObfuscatedName("da") @Implements("VorbisMapping") public class VorbisMapping { - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("submaps") int submaps; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("mappingMux") int mappingMux; - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("submapFloor") int[] submapFloor; - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("submapResidue") int[] submapResidue; diff --git a/runescape-client/src/main/java/VorbisResidue.java b/runescape-client/src/main/java/VorbisResidue.java index ca1d7d2e4d..93774b3806 100644 --- a/runescape-client/src/main/java/VorbisResidue.java +++ b/runescape-client/src/main/java/VorbisResidue.java @@ -5,25 +5,25 @@ import net.runelite.mapping.ObfuscatedName; @ObfuscatedName("di") @Implements("VorbisResidue") public class VorbisResidue { - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("residueType") int residueType; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("begin") int begin; - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("end") int end; - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("partitionSize") int partitionSize; - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("classifications") int classifications; - @ObfuscatedName("p") + @ObfuscatedName("b") @Export("classbook") int classbook; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("cascade") int[] cascade; @@ -56,8 +56,8 @@ public class VorbisResidue { } - @ObfuscatedName("u") - void method2554(float[] var1, int var2, boolean var3) { + @ObfuscatedName("f") + void method2531(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].method2356(); + var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method2342(); 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.method2357(); + float[] var17 = var14.method2349(); 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.method2357(); + float[] var19 = var14.method2349(); 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 237db9439c..f47e3f54cf 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("ct") +@ObfuscatedName("ci") @Implements("VorbisSample") public class VorbisSample extends Node { - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("VorbisSample_bytes") static byte[] VorbisSample_bytes; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("VorbisSample_byteOffset") static int VorbisSample_byteOffset; - @ObfuscatedName("w") + @ObfuscatedName("a") @Export("VorbisSample_bitOffset") static int VorbisSample_bitOffset; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("VorbisSample_blockSize0") static int VorbisSample_blockSize0; - @ObfuscatedName("k") + @ObfuscatedName("c") @Export("VorbisSample_blockSize1") static int VorbisSample_blockSize1; - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "[Lcx;" + signature = "[Lcm;" ) @Export("VorbisSample_codebooks") static VorbisCodebook[] VorbisSample_codebooks; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "[Ldw;" + signature = "[Lcv;" ) @Export("VorbisSample_floors") static VorbisFloor[] VorbisSample_floors; - @ObfuscatedName("e") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "[Ldi;" ) @Export("VorbisSample_residues") static VorbisResidue[] VorbisSample_residues; - @ObfuscatedName("n") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "[Ldz;" + signature = "[Lda;" ) @Export("VorbisSample_mappings") static VorbisMapping[] VorbisSample_mappings; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("VorbisSample_blockFlags") static boolean[] VorbisSample_blockFlags; - @ObfuscatedName("c") + @ObfuscatedName("t") @Export("VorbisSample_mapping") static int[] VorbisSample_mapping; - @ObfuscatedName("a") - static boolean field1357; - @ObfuscatedName("v") - static float[] field1362; - @ObfuscatedName("q") - static float[] field1345; - @ObfuscatedName("l") - static float[] field1364; @ObfuscatedName("j") - static float[] field1365; - @ObfuscatedName("af") - static float[] field1361; - @ObfuscatedName("ad") - static float[] field1367; - @ObfuscatedName("am") - static float[] field1368; - @ObfuscatedName("ai") - static int[] field1369; - @ObfuscatedName("ag") - static int[] field1370; - @ObfuscatedName("u") - byte[][] field1348; + static boolean field1334; + @ObfuscatedName("m") + static float[] field1327; + @ObfuscatedName("g") + static float[] field1340; + @ObfuscatedName("r") + static float[] field1341; + @ObfuscatedName("q") + static float[] field1342; + @ObfuscatedName("aa") + static float[] field1343; + @ObfuscatedName("av") + static float[] field1320; + @ObfuscatedName("aw") + static float[] field1345; + @ObfuscatedName("as") + static int[] field1346; + @ObfuscatedName("ak") + static int[] field1339; @ObfuscatedName("f") + byte[][] field1317; + @ObfuscatedName("i") @Export("sampleRate") int sampleRate; - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("sampleCount") int sampleCount; - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("start") int start; - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("end") int end; - @ObfuscatedName("p") - boolean field1340; - @ObfuscatedName("d") - float[] field1358; - @ObfuscatedName("s") - int field1359; - @ObfuscatedName("t") - int field1360; - @ObfuscatedName("m") - boolean field1355; - @ObfuscatedName("ao") + @ObfuscatedName("b") + boolean field1324; + @ObfuscatedName("n") + float[] field1335; + @ObfuscatedName("u") + int field1336; + @ObfuscatedName("z") + int field1337; + @ObfuscatedName("h") + boolean field1323; + @ObfuscatedName("au") @Export("samples") byte[] samples; - @ObfuscatedName("aw") - int field1372; - @ObfuscatedName("ak") - int field1371; + @ObfuscatedName("ah") + int field1349; + @ObfuscatedName("aq") + int field1347; static { - field1357 = false; + field1334 = false; } VorbisSample(byte[] var1) { this.read(var1); } - @ObfuscatedName("z") + @ObfuscatedName("p") @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.field1340 = true; + this.field1324 = true; } int var3 = var2.readInt(); - this.field1348 = new byte[var3][]; + this.field1317 = 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.field1348[var4] = var7; + this.field1317[var4] = var7; } } - @ObfuscatedName("h") - float[] method2389(int var1) { - VorbisSample_setData(this.field1348[var1], 0); + @ObfuscatedName("e") + float[] method2371(int var1) { + VorbisSample_setData(this.field1317[var1], 0); readBit(); - int var2 = readBits(class160.iLog(VorbisSample_mapping.length - 1)); + int var2 = readBits(Frames.iLog(VorbisSample_mapping.length - 1)); boolean var3 = VorbisSample_blockFlags[var2]; int var4 = var3 ? VorbisSample_blockSize1 : VorbisSample_blockSize0; boolean var5 = false; @@ -192,41 +192,41 @@ public class VorbisSample extends Node { for (var17 = 0; var17 < var14.submaps; ++var17) { VorbisResidue var18 = VorbisSample_residues[var14.submapResidue[var17]]; - float[] var19 = field1362; - var18.method2554(var19, var4 >> 1, var45); + float[] var19 = field1327; + var18.method2531(var19, var4 >> 1, var45); } int var40; if (!var15) { var17 = var14.mappingMux; var40 = var14.submapFloor[var17]; - VorbisSample_floors[var40].method2436(field1362, var4 >> 1); + VorbisSample_floors[var40].method2405(field1327, var4 >> 1); } - int var41; + int var42; if (var15) { for (var17 = var4 >> 1; var17 < var4; ++var17) { - field1362[var17] = 0.0F; + field1327[var17] = 0.0F; } } else { var17 = var4 >> 1; var40 = var4 >> 2; - var41 = var4 >> 3; - float[] var20 = field1362; + var42 = var4 >> 3; + float[] var43 = field1327; int var21; for (var21 = 0; var21 < var17; ++var21) { - var20[var21] *= 0.5F; + var43[var21] *= 0.5F; } for (var21 = var17; var21 < var4; ++var21) { - var20[var21] = -var20[var4 - var21 - 1]; + var43[var21] = -var43[var4 - var21 - 1]; } - float[] var44 = var3 ? field1361 : field1345; - float[] var22 = var3 ? field1367 : field1364; - float[] var23 = var3 ? field1368 : field1365; - int[] var24 = var3 ? field1370 : field1369; + float[] var44 = var3 ? field1343 : field1340; + float[] var22 = var3 ? field1320 : field1341; + float[] var23 = var3 ? field1345 : field1342; + int[] var24 = var3 ? field1339 : field1346; int var25; float var26; @@ -234,30 +234,30 @@ public class VorbisSample extends Node { float var28; float var29; for (var25 = 0; var25 < var40; ++var25) { - var26 = var20[var25 * 4] - var20[var4 - var25 * 4 - 1]; - var27 = var20[var25 * 4 + 2] - var20[var4 - var25 * 4 - 3]; + var26 = var43[var25 * 4] - var43[var4 - var25 * 4 - 1]; + var27 = var43[var25 * 4 + 2] - var43[var4 - var25 * 4 - 3]; var28 = var44[var25 * 2]; var29 = var44[var25 * 2 + 1]; - var20[var4 - var25 * 4 - 1] = var26 * var28 - var27 * var29; - var20[var4 - var25 * 4 - 3] = var26 * var29 + var27 * var28; + var43[var4 - var25 * 4 - 1] = var26 * var28 - var27 * var29; + var43[var4 - var25 * 4 - 3] = var26 * var29 + var27 * var28; } float var30; float var31; - for (var25 = 0; var25 < var41; ++var25) { - var26 = var20[var17 + var25 * 4 + 3]; - var27 = var20[var17 + var25 * 4 + 1]; - var28 = var20[var25 * 4 + 3]; - var29 = var20[var25 * 4 + 1]; - var20[var17 + var25 * 4 + 3] = var26 + var28; - var20[var17 + var25 * 4 + 1] = var27 + var29; + for (var25 = 0; var25 < var42; ++var25) { + var26 = var43[var17 + var25 * 4 + 3]; + var27 = var43[var17 + var25 * 4 + 1]; + var28 = var43[var25 * 4 + 3]; + var29 = var43[var25 * 4 + 1]; + var43[var17 + var25 * 4 + 3] = var26 + var28; + var43[var17 + var25 * 4 + 1] = var27 + var29; var30 = var44[var17 - 4 - var25 * 4]; var31 = var44[var17 - 3 - var25 * 4]; - var20[var25 * 4 + 3] = (var26 - var28) * var30 - (var27 - var29) * var31; - var20[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31; + var43[var25 * 4 + 3] = (var26 - var28) * var30 - (var27 - var29) * var31; + var43[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31; } - var25 = class160.iLog(var4 - 1); + var25 = Frames.iLog(var4 - 1); int var47; int var48; @@ -273,133 +273,133 @@ public class VorbisSample extends Node { for (int var32 = 0; var32 < var4 >> var47 + 4; ++var32) { int var33 = var32 * 4; - float var34 = var20[var51 - 1 - var33]; - float var35 = var20[var51 - 3 - var33]; - float var36 = var20[var52 - 1 - var33]; - float var37 = var20[var52 - 3 - var33]; - var20[var51 - 1 - var33] = var34 + var36; - var20[var51 - 3 - var33] = var35 + var37; + float var34 = var43[var51 - 1 - var33]; + float var35 = var43[var51 - 3 - var33]; + float var36 = var43[var52 - 1 - var33]; + float var37 = var43[var52 - 3 - var33]; + var43[var51 - 1 - var33] = var34 + var36; + var43[var51 - 3 - var33] = var35 + var37; float var38 = var44[var32 * var49]; float var39 = var44[var32 * var49 + 1]; - var20[var52 - 1 - var33] = (var34 - var36) * var38 - (var35 - var37) * var39; - var20[var52 - 3 - var33] = (var35 - var37) * var38 + (var34 - var36) * var39; + var43[var52 - 1 - var33] = (var34 - var36) * var38 - (var35 - var37) * var39; + var43[var52 - 3 - var33] = (var35 - var37) * var38 + (var34 - var36) * var39; } } } - for (var47 = 1; var47 < var41 - 1; ++var47) { + for (var47 = 1; var47 < var42 - 1; ++var47) { var48 = var24[var47]; if (var47 < var48) { var49 = var47 * 8; var50 = var48 * 8; - var30 = var20[var49 + 1]; - var20[var49 + 1] = var20[var50 + 1]; - var20[var50 + 1] = var30; - var30 = var20[var49 + 3]; - var20[var49 + 3] = var20[var50 + 3]; - var20[var50 + 3] = var30; - var30 = var20[var49 + 5]; - var20[var49 + 5] = var20[var50 + 5]; - var20[var50 + 5] = var30; - var30 = var20[var49 + 7]; - var20[var49 + 7] = var20[var50 + 7]; - var20[var50 + 7] = var30; + var30 = var43[var49 + 1]; + var43[var49 + 1] = var43[var50 + 1]; + var43[var50 + 1] = var30; + var30 = var43[var49 + 3]; + var43[var49 + 3] = var43[var50 + 3]; + var43[var50 + 3] = var30; + var30 = var43[var49 + 5]; + var43[var49 + 5] = var43[var50 + 5]; + var43[var50 + 5] = var30; + var30 = var43[var49 + 7]; + var43[var49 + 7] = var43[var50 + 7]; + var43[var50 + 7] = var30; } } for (var47 = 0; var47 < var17; ++var47) { - var20[var47] = var20[var47 * 2 + 1]; + var43[var47] = var43[var47 * 2 + 1]; } - for (var47 = 0; var47 < var41; ++var47) { - var20[var4 - 1 - var47 * 2] = var20[var47 * 4]; - var20[var4 - 2 - var47 * 2] = var20[var47 * 4 + 1]; - var20[var4 - var40 - 1 - var47 * 2] = var20[var47 * 4 + 2]; - var20[var4 - var40 - 2 - var47 * 2] = var20[var47 * 4 + 3]; + for (var47 = 0; var47 < var42; ++var47) { + var43[var4 - 1 - var47 * 2] = var43[var47 * 4]; + var43[var4 - 2 - var47 * 2] = var43[var47 * 4 + 1]; + var43[var4 - var40 - 1 - var47 * 2] = var43[var47 * 4 + 2]; + var43[var4 - var40 - 2 - var47 * 2] = var43[var47 * 4 + 3]; } - for (var47 = 0; var47 < var41; ++var47) { + for (var47 = 0; var47 < var42; ++var47) { var27 = var23[var47 * 2]; var28 = var23[var47 * 2 + 1]; - var29 = var20[var17 + var47 * 2]; - var30 = var20[var17 + var47 * 2 + 1]; - var31 = var20[var4 - 2 - var47 * 2]; - float var53 = var20[var4 - 1 - var47 * 2]; + var29 = var43[var17 + var47 * 2]; + var30 = var43[var17 + var47 * 2 + 1]; + var31 = var43[var4 - 2 - var47 * 2]; + float var53 = var43[var4 - 1 - var47 * 2]; float var54 = var28 * (var29 - var31) + var27 * (var30 + var53); - var20[var17 + var47 * 2] = (var29 + var31 + var54) * 0.5F; - var20[var4 - 2 - var47 * 2] = (var29 + var31 - var54) * 0.5F; + var43[var17 + var47 * 2] = (var29 + var31 + var54) * 0.5F; + var43[var4 - 2 - var47 * 2] = (var29 + var31 - var54) * 0.5F; var54 = var28 * (var30 + var53) - var27 * (var29 - var31); - var20[var17 + var47 * 2 + 1] = (var30 - var53 + var54) * 0.5F; - var20[var4 - 1 - var47 * 2] = (-var30 + var53 + var54) * 0.5F; + var43[var17 + var47 * 2 + 1] = (var30 - var53 + var54) * 0.5F; + var43[var4 - 1 - var47 * 2] = (-var30 + var53 + var54) * 0.5F; } for (var47 = 0; var47 < var40; ++var47) { - var20[var47] = var20[var17 + var47 * 2] * var22[var47 * 2] + var20[var17 + var47 * 2 + 1] * var22[var47 * 2 + 1]; - var20[var17 - 1 - var47] = var20[var17 + var47 * 2] * var22[var47 * 2 + 1] - var20[var17 + var47 * 2 + 1] * var22[var47 * 2]; + var43[var47] = var43[var17 + var47 * 2] * var22[var47 * 2] + var43[var17 + var47 * 2 + 1] * var22[var47 * 2 + 1]; + var43[var17 - 1 - var47] = var43[var17 + var47 * 2] * var22[var47 * 2 + 1] - var43[var17 + var47 * 2 + 1] * var22[var47 * 2]; } for (var47 = 0; var47 < var40; ++var47) { - var20[var47 + (var4 - var40)] = -var20[var47]; + var43[var47 + (var4 - var40)] = -var43[var47]; } for (var47 = 0; var47 < var40; ++var47) { - var20[var47] = var20[var40 + var47]; + var43[var47] = var43[var40 + var47]; } for (var47 = 0; var47 < var40; ++var47) { - var20[var40 + var47] = -var20[var40 - var47 - 1]; + var43[var40 + var47] = -var43[var40 - var47 - 1]; } for (var47 = 0; var47 < var40; ++var47) { - var20[var17 + var47] = var20[var4 - var47 - 1]; + 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); - var10000 = field1362; + var10000 = field1327; var10000[var47] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); } for (var47 = var11; var47 < var12; ++var47) { var27 = (float)Math.sin(((double)(var47 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D); - var10000 = field1362; + var10000 = field1327; var10000[var47] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); } } - float[] var42 = null; - if (this.field1359 > 0) { - var40 = var4 + this.field1359 >> 2; - var42 = new float[var40]; - int var43; - if (!this.field1355) { - for (var41 = 0; var41 < this.field1360; ++var41) { - var43 = var41 + (this.field1359 >> 1); - var42[var41] += this.field1358[var43]; + float[] var41 = null; + if (this.field1336 > 0) { + var40 = var4 + this.field1336 >> 2; + var41 = new float[var40]; + int var20; + if (!this.field1323) { + for (var42 = 0; var42 < this.field1337; ++var42) { + var20 = var42 + (this.field1336 >> 1); + var41[var42] += this.field1335[var20]; } } if (!var15) { - for (var41 = var8; var41 < var4 >> 1; ++var41) { - var43 = var42.length - (var4 >> 1) + var41; - var42[var43] += field1362[var41]; + for (var42 = var8; var42 < var4 >> 1; ++var42) { + var20 = var41.length - (var4 >> 1) + var42; + var41[var20] += field1327[var42]; } } } - float[] var46 = this.field1358; - this.field1358 = field1362; - field1362 = var46; - this.field1359 = var4; - this.field1360 = var12 - (var4 >> 1); - this.field1355 = var15; - return var42; + float[] var46 = this.field1335; + this.field1335 = field1327; + field1327 = var46; + this.field1336 = var4; + this.field1337 = var12 - (var4 >> 1); + this.field1323 = var15; + return var41; } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "([I)Lcw;" + signature = "([I)Lcc;" ) @Export("toRawSound") RawSound toRawSound(int[] var1) { @@ -407,21 +407,21 @@ public class VorbisSample extends Node { return null; } else { if (this.samples == null) { - this.field1359 = 0; - this.field1358 = new float[VorbisSample_blockSize1]; + this.field1336 = 0; + this.field1335 = new float[VorbisSample_blockSize1]; this.samples = new byte[this.sampleCount]; - this.field1372 = 0; - this.field1371 = 0; + this.field1349 = 0; + this.field1347 = 0; } - for (; this.field1371 < this.field1348.length; ++this.field1371) { + for (; this.field1347 < this.field1317.length; ++this.field1347) { if (var1 != null && var1[0] <= 0) { return null; } - float[] var2 = this.method2389(this.field1371); + float[] var2 = this.method2371(this.field1347); if (var2 != null) { - int var3 = this.field1372; + int var3 = this.field1349; int var4 = var2.length; if (var4 > this.sampleCount - var3) { var4 = this.sampleCount - var3; @@ -437,21 +437,21 @@ public class VorbisSample extends Node { } if (var1 != null) { - var1[0] -= var3 - this.field1372; + var1[0] -= var3 - this.field1349; } - this.field1372 = var3; + this.field1349 = var3; } } - this.field1358 = null; + this.field1335 = null; byte[] var7 = this.samples; this.samples = null; - return new RawSound(this.sampleRate, var7, this.start, this.end, this.field1340); + return new RawSound(this.sampleRate, var7, this.start, this.end, this.field1324); } } - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("float32Unpack") static float float32Unpack(int var0) { int var1 = var0 & 2097151; @@ -464,7 +464,7 @@ public class VorbisSample extends Node { return (float)((double)var1 * Math.pow(2.0D, (double)(var3 - 788))); } - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("VorbisSample_setData") static void VorbisSample_setData(byte[] var0, int var1) { VorbisSample_bytes = var0; @@ -472,7 +472,7 @@ public class VorbisSample extends Node { VorbisSample_bitOffset = 0; } - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("readBit") static int readBit() { int var0 = VorbisSample_bytes[VorbisSample_byteOffset] >> VorbisSample_bitOffset & 1; @@ -482,7 +482,7 @@ public class VorbisSample extends Node { return var0; } - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("readBits") static int readBits(int var0) { int var1 = 0; @@ -507,12 +507,12 @@ public class VorbisSample extends Node { return var1; } - @ObfuscatedName("p") - static void method2392(byte[] var0) { + @ObfuscatedName("b") + static void method2370(byte[] var0) { VorbisSample_setData(var0, 0); VorbisSample_blockSize0 = 1 << readBits(4); VorbisSample_blockSize1 = 1 << readBits(4); - field1362 = new float[VorbisSample_blockSize1]; + field1327 = new float[VorbisSample_blockSize1]; int var1; int var2; @@ -531,37 +531,46 @@ public class VorbisSample extends Node { var6[var7 * 2 + 1] = -((float)Math.sin((double)(var7 * 4) * 3.141592653589793D / (double)var2)); } - float[] var12 = new float[var3]; + float[] var18 = new float[var3]; for (int var8 = 0; var8 < var4; ++var8) { - var12[var8 * 2] = (float)Math.cos((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); - var12[var8 * 2 + 1] = (float)Math.sin((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); + var18[var8 * 2] = (float)Math.cos((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); + var18[var8 * 2 + 1] = (float)Math.sin((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); } - float[] var13 = new float[var4]; + float[] var19 = new float[var4]; for (int var9 = 0; var9 < var5; ++var9) { - var13[var9 * 2] = (float)Math.cos((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2); - var13[var9 * 2 + 1] = -((float)Math.sin((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2)); + var19[var9 * 2] = (float)Math.cos((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2); + var19[var9 * 2 + 1] = -((float)Math.sin((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2)); } - int[] var14 = new int[var5]; - int var10 = class160.iLog(var5 - 1); + int[] var20 = new int[var5]; + int var10 = Frames.iLog(var5 - 1); for (int var11 = 0; var11 < var5; ++var11) { - var14[var11] = KeyHandler.method843(var11, var10); + int var15 = var11; + int var16 = var10; + + int var17; + for (var17 = 0; var16 > 0; --var16) { + var17 = var17 << 1 | var15 & 1; + var15 >>>= 1; + } + + var20[var11] = var17; } if (var1 != 0) { - field1361 = var6; - field1367 = var12; - field1368 = var13; - field1370 = var14; + field1343 = var6; + field1320 = var18; + field1345 = var19; + field1339 = var20; } else { - field1345 = var6; - field1364 = var12; - field1365 = var13; - field1369 = var14; + field1340 = var6; + field1341 = var18; + field1342 = var19; + field1346 = var20; } } @@ -603,40 +612,40 @@ public class VorbisSample extends Node { VorbisSample_blockFlags = new boolean[var5]; VorbisSample_mapping = new int[var5]; - for (int var15 = 0; var15 < var5; ++var15) { - VorbisSample_blockFlags[var15] = readBit() != 0; + for (int var21 = 0; var21 < var5; ++var21) { + VorbisSample_blockFlags[var21] = readBit() != 0; readBits(16); readBits(16); - VorbisSample_mapping[var15] = readBits(8); + VorbisSample_mapping[var21] = readBits(8); } } - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lhf;)Z" + signature = "(Lhz;)Z" ) - static boolean method2390(AbstractArchive var0) { - if (!field1357) { + static boolean method2372(AbstractArchive var0) { + if (!field1334) { byte[] var1 = var0.takeFile(0, 0); if (var1 == null) { return false; } - method2392(var1); - field1357 = true; + method2370(var1); + field1334 = true; } return true; } - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(Lhf;II)Lct;" + signature = "(Lhz;II)Lci;" ) @Export("readMusicSample") static VorbisSample readMusicSample(AbstractArchive var0, int var1, int var2) { - if (!method2390(var0)) { + if (!method2372(var0)) { var0.tryLoadFile(var1, var2); return null; } else { diff --git a/runescape-client/src/main/java/WallDecoration.java b/runescape-client/src/main/java/WallDecoration.java index 75eb0e2cdb..66bf2c5f5b 100644 --- a/runescape-client/src/main/java/WallDecoration.java +++ b/runescape-client/src/main/java/WallDecoration.java @@ -4,74 +4,72 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("et") +@ObfuscatedName("ee") @Implements("WallDecoration") public final class WallDecoration { - @ObfuscatedName("bf") - static String field1914; - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1205113251 + intValue = -1682517589 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -271474909 + intValue = 835715707 ) @Export("x") int x; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1267605537 + intValue = 196779483 ) @Export("y") int y; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1727501807 + intValue = 1668025043 ) @Export("orientation") int orientation; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1125268543 + intValue = -36455913 ) @Export("orientation2") int orientation2; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1924743317 + intValue = 1853023359 ) @Export("xOffset") int xOffset; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -2072940953 + intValue = 1490962747 ) @Export("yOffset") int yOffset; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lee;" + signature = "Lep;" ) @Export("entity1") public Entity entity1; - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Lee;" + signature = "Lep;" ) @Export("entity2") public Entity entity2; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - longValue = -1256134443736608047L + longValue = 7500452750327667815L ) @Export("tag") public long tag; - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1975621391 + intValue = -265932947 ) @Export("flags") int flags; @@ -80,61 +78,4 @@ public final class WallDecoration { this.tag = 0L; this.flags = 0; } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(IB)Lig;", - garbageValue = "-81" - ) - public static FloorUnderlayDefinition method3339(int var0) { - FloorUnderlayDefinition var1 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var0); - var1 = new FloorUnderlayDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2), var0); - } - - var1.postDecode(); - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("f") - public static boolean method3340(long var0) { - boolean var2 = var0 != 0L; - if (var2) { - boolean var3 = (int)(var0 >>> 16 & 1L) == 1; - var2 = !var3; - } - - return var2; - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "(B)[Llm;", - garbageValue = "-38" - ) - public static IndexedSprite[] method3341() { - IndexedSprite[] var0 = new IndexedSprite[class325.SpriteBuffer_spriteCount]; - - for (int var1 = 0; var1 < class325.SpriteBuffer_spriteCount; ++var1) { - IndexedSprite var2 = var0[var1] = new IndexedSprite(); - var2.width = class325.SpriteBuffer_spriteWidth; - var2.height = UserComparator9.SpriteBuffer_spriteHeight; - var2.xOffset = UrlRequester.SpriteBuffer_xOffsets[var1]; - var2.yOffset = class216.SpriteBuffer_yOffsets[var1]; - var2.subWidth = class325.SpriteBuffer_spriteWidths[var1]; - var2.subHeight = VarcInt.SpriteBuffer_spriteHeights[var1]; - var2.palette = class325.SpriteBuffer_spritePalette; - var2.pixels = FillMode.SpriteBuffer_pixels[var1]; - } - - PcmPlayer.method2510(); - return var0; - } } diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index 4c326c4727..cf1d9aa78f 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -4,694 +4,688 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hl") +@ObfuscatedName("ha") @Implements("Widget") public class Widget extends Node { - @ObfuscatedName("y") - @Export("Widget_loadedInterfaces") - public static boolean[] Widget_loadedInterfaces; - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Lhf;" - ) - @Export("Widget_spritesArchive") - public static AbstractArchive Widget_spritesArchive; @ObfuscatedName("x") + @Export("Widget_loadedInterfaces") + static boolean[] Widget_loadedInterfaces; + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lhf;" + signature = "Lhz;" ) - @Export("Widget_fontsArchive") - public static AbstractArchive Widget_fontsArchive; - @ObfuscatedName("o") + @Export("Widget_modelsArchive") + static AbstractArchive Widget_modelsArchive; + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Lef;" + signature = "Leb;" ) @Export("Widget_cachedSprites") - static EvictingDualNodeHashTable Widget_cachedSprites; - @ObfuscatedName("e") + public static EvictingDualNodeHashTable Widget_cachedSprites; + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lef;" + signature = "Leb;" ) @Export("Widget_cachedModels") - static EvictingDualNodeHashTable Widget_cachedModels; - @ObfuscatedName("n") + public static EvictingDualNodeHashTable Widget_cachedModels; + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lef;" + signature = "Leb;" ) @Export("Widget_cachedFonts") - static EvictingDualNodeHashTable Widget_cachedFonts; - @ObfuscatedName("r") + public static EvictingDualNodeHashTable Widget_cachedFonts; + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Lef;" + signature = "Leb;" ) @Export("Widget_cachedSpriteMasks") - static EvictingDualNodeHashTable Widget_cachedSpriteMasks; - @ObfuscatedName("c") - public static boolean field2647; - @ObfuscatedName("a") + public static EvictingDualNodeHashTable Widget_cachedSpriteMasks; + @ObfuscatedName("t") + public static boolean field2549; + @ObfuscatedName("j") @Export("isIf3") public boolean isIf3; - @ObfuscatedName("d") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1682461819 + intValue = 1299476265 ) @Export("id") public int id; - @ObfuscatedName("s") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 304580101 + intValue = -433623057 ) @Export("childIndex") public int childIndex; - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1464178541 + intValue = 169687735 ) @Export("type") public int type; - @ObfuscatedName("m") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1207146159 + intValue = 1927968519 ) @Export("buttonType") public int buttonType; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -436688561 + intValue = -300120459 ) @Export("contentType") public int contentType; - @ObfuscatedName("q") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 797702061 + intValue = 526386257 ) @Export("xAlignment") public int xAlignment; - @ObfuscatedName("l") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1839904363 + intValue = -881640361 ) @Export("yAlignment") public int yAlignment; - @ObfuscatedName("j") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 932537707 + intValue = -1294049187 ) @Export("widthAlignment") public int widthAlignment; - @ObfuscatedName("af") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -861293309 + intValue = 282021115 ) @Export("heightAlignment") public int heightAlignment; - @ObfuscatedName("ad") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 1387465487 + intValue = 1359404571 ) @Export("rawX") public int rawX; - @ObfuscatedName("am") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = 69728839 + intValue = 426334007 ) @Export("rawY") public int rawY; - @ObfuscatedName("ai") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -1496687489 + intValue = 477325163 ) @Export("rawWidth") public int rawWidth; - @ObfuscatedName("ag") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -1477852971 + intValue = -365864037 ) @Export("rawHeight") public int rawHeight; - @ObfuscatedName("ao") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -1601823443 + intValue = -2146904513 ) @Export("x") public int x; - @ObfuscatedName("aw") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = -543253817 + intValue = -787900839 ) @Export("y") public int y; - @ObfuscatedName("ak") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = 201590315 + intValue = 372029795 ) @Export("width") public int width; - @ObfuscatedName("aa") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -1083073471 + intValue = -1882269787 ) @Export("height") public int height; - @ObfuscatedName("ab") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = 1082009517 + intValue = -1726055513 ) - public int field2594; + public int field2617; @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 701840215 + intValue = 227763001 ) - public int field2694; - @ObfuscatedName("av") + public int field2569; + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = -603142629 + intValue = -782776051 ) @Export("parentId") public int parentId; - @ObfuscatedName("aq") + @ObfuscatedName("ay") @Export("isHidden") public boolean isHidden; - @ObfuscatedName("ac") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 559295079 + intValue = 1944956525 ) @Export("scrollX") public int scrollX; - @ObfuscatedName("az") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -1519015545 + intValue = -405454075 ) @Export("scrollY") public int scrollY; - @ObfuscatedName("at") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 1743610313 + intValue = -1082844581 ) @Export("scrollWidth") public int scrollWidth; @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -768640271 + intValue = 557803519 ) @Export("scrollHeight") public int scrollHeight; - @ObfuscatedName("aj") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = 875298849 + intValue = -1855119185 ) @Export("color") public int color; - @ObfuscatedName("ap") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 1946590123 + intValue = 1166086105 ) @Export("color2") public int color2; - @ObfuscatedName("an") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -1868971829 + intValue = 1149435031 ) @Export("mouseOverColor") public int mouseOverColor; - @ObfuscatedName("al") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 1913787705 + intValue = -1092901165 ) @Export("mouseOverColor2") public int mouseOverColor2; - @ObfuscatedName("ay") + @ObfuscatedName("af") @Export("fill") public boolean fill; - @ObfuscatedName("ax") + @ObfuscatedName("ap") @ObfuscatedSignature( - signature = "Llz;" + signature = "Llg;" ) @Export("fillMode") public FillMode fillMode; - @ObfuscatedName("au") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = -944834953 + intValue = -808988025 ) @Export("transparencyTop") public int transparencyTop; - @ObfuscatedName("as") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = 565283995 + intValue = -2007030025 ) @Export("transparencyBot") public int transparencyBot; - @ObfuscatedName("ah") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 1175693173 + intValue = 567629033 ) @Export("lineWid") public int lineWid; - @ObfuscatedName("bi") - public boolean field2709; - @ObfuscatedName("bo") + @ObfuscatedName("bj") + public boolean field2676; + @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = -3923559 + intValue = 161600005 ) @Export("spriteId2") public int spriteId2; - @ObfuscatedName("bx") + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = -1169722885 + intValue = 754156307 ) @Export("spriteId") public int spriteId; - @ObfuscatedName("bu") + @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = 1021847911 + intValue = 515570621 ) @Export("spriteAngle") public int spriteAngle; - @ObfuscatedName("bd") + @ObfuscatedName("bl") @Export("spriteTiling") public boolean spriteTiling; - @ObfuscatedName("bn") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = 433329709 + intValue = -469270917 ) @Export("outline") public int outline; - @ObfuscatedName("bj") + @ObfuscatedName("bx") @ObfuscatedGetter( - intValue = -1127682419 + intValue = 150600095 ) @Export("spriteShadow") public int spriteShadow; - @ObfuscatedName("bm") + @ObfuscatedName("bc") @Export("spriteFlipV") public boolean spriteFlipV; - @ObfuscatedName("bq") + @ObfuscatedName("by") @Export("spriteFlipH") public boolean spriteFlipH; - @ObfuscatedName("bf") + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = 1709757885 + intValue = -807433521 ) @Export("modelType") public int modelType; - @ObfuscatedName("by") + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = 1705471533 + intValue = -1129211799 ) @Export("modelId") public int modelId; - @ObfuscatedName("br") + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = 178630707 + intValue = 1125389583 ) @Export("modelType2") int modelType2; - @ObfuscatedName("ba") + @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = 1939746225 + intValue = -392341679 ) @Export("modelId2") int modelId2; - @ObfuscatedName("bb") + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = 29524191 + intValue = 309774183 ) @Export("sequenceId") public int sequenceId; - @ObfuscatedName("bg") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = -540899077 + intValue = 942088921 ) @Export("sequenceId2") public int sequenceId2; - @ObfuscatedName("bw") + @ObfuscatedName("bb") @ObfuscatedGetter( - intValue = -1645734867 + intValue = -85793983 ) @Export("modelOffsetX") public int modelOffsetX; - @ObfuscatedName("be") + @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = -1267088937 + intValue = 41223313 ) @Export("modelOffsetY") public int modelOffsetY; - @ObfuscatedName("bt") + @ObfuscatedName("bv") @ObfuscatedGetter( - intValue = 1658631801 + intValue = -1935540911 ) @Export("modelAngleX") public int modelAngleX; - @ObfuscatedName("bl") + @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = 922344031 + intValue = 1626422203 ) @Export("modelAngleY") public int modelAngleY; - @ObfuscatedName("bp") + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = -1525531675 + intValue = -1986701179 ) @Export("modelAngleZ") public int modelAngleZ; - @ObfuscatedName("bv") + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = -1852880265 + intValue = -2039159593 ) @Export("modelZoom") public int modelZoom; - @ObfuscatedName("bs") + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = -268605009 + intValue = 558694563 ) - public int field2711; - @ObfuscatedName("bz") + public int field2645; + @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = -751685799 + intValue = -1622987205 ) - public int field2633; - @ObfuscatedName("bc") + public int field2607; + @ObfuscatedName("br") @Export("modelOrthog") public boolean modelOrthog; - @ObfuscatedName("bh") + @ObfuscatedName("bt") @Export("modelTransparency") public boolean modelTransparency; - @ObfuscatedName("bk") + @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = -137614795 + intValue = 1456776345 ) @Export("itemQuantityMode") public int itemQuantityMode; - @ObfuscatedName("cm") + @ObfuscatedName("co") @ObfuscatedGetter( - intValue = -1844014927 + intValue = -600879771 ) @Export("fontId") public int fontId; - @ObfuscatedName("cd") + @ObfuscatedName("cp") @Export("text") public String text; - @ObfuscatedName("cv") + @ObfuscatedName("cd") @Export("text2") public String text2; - @ObfuscatedName("cl") + @ObfuscatedName("cj") @ObfuscatedGetter( - intValue = -1989359281 + intValue = -1209305235 ) @Export("textLineHeight") public int textLineHeight; - @ObfuscatedName("cg") + @ObfuscatedName("cq") @ObfuscatedGetter( - intValue = 19289147 + intValue = -188667201 ) @Export("textXAlignment") public int textXAlignment; - @ObfuscatedName("ch") + @ObfuscatedName("cb") @ObfuscatedGetter( - intValue = -1956461255 + intValue = -116044435 ) @Export("textYAlignment") public int textYAlignment; - @ObfuscatedName("co") + @ObfuscatedName("cf") @Export("textShadowed") public boolean textShadowed; - @ObfuscatedName("cr") + @ObfuscatedName("cs") @ObfuscatedGetter( - intValue = 604950213 + intValue = -573415153 ) @Export("paddingX") public int paddingX; - @ObfuscatedName("ck") + @ObfuscatedName("ch") @ObfuscatedGetter( - intValue = 2056205059 + intValue = 1908229703 ) @Export("paddingY") public int paddingY; - @ObfuscatedName("cb") + @ObfuscatedName("ca") @Export("inventoryXOffsets") public int[] inventoryXOffsets; - @ObfuscatedName("cy") + @ObfuscatedName("cn") @Export("inventoryYOffsets") public int[] inventoryYOffsets; - @ObfuscatedName("cn") + @ObfuscatedName("cx") @Export("inventorySprites") public int[] inventorySprites; - @ObfuscatedName("cj") + @ObfuscatedName("ck") @Export("itemActions") public String[] itemActions; - @ObfuscatedName("cq") + @ObfuscatedName("ce") @ObfuscatedGetter( - intValue = -748818631 + intValue = -1025051947 ) @Export("clickMask") public int clickMask; - @ObfuscatedName("ci") - public boolean field2651; @ObfuscatedName("cu") - public byte[][] field2592; - @ObfuscatedName("cs") - public byte[][] field2653; - @ObfuscatedName("ca") - public int[] field2654; - @ObfuscatedName("cf") - public int[] field2655; - @ObfuscatedName("dw") + public boolean field2625; + @ObfuscatedName("cg") + public byte[][] field2626; + @ObfuscatedName("ct") + public byte[][] field2629; + @ObfuscatedName("cm") + public int[] field2631; + @ObfuscatedName("cl") + public int[] field2670; + @ObfuscatedName("do") @Export("dataText") public String dataText; - @ObfuscatedName("de") + @ObfuscatedName("dk") @Export("actions") public String[] actions; @ObfuscatedName("dx") @ObfuscatedSignature( - signature = "Lhl;" + signature = "Lha;" ) @Export("parent") public Widget parent; - @ObfuscatedName("dc") + @ObfuscatedName("de") @ObfuscatedGetter( - intValue = 1585908023 + intValue = 1517424383 ) @Export("dragZoneSize") public int dragZoneSize; - @ObfuscatedName("dk") + @ObfuscatedName("df") @ObfuscatedGetter( - intValue = -608176245 + intValue = -1198293361 ) @Export("dragThreshold") public int dragThreshold; - @ObfuscatedName("dj") + @ObfuscatedName("di") @Export("isScrollBar") public boolean isScrollBar; - @ObfuscatedName("dp") + @ObfuscatedName("dr") @Export("spellActionName") public String spellActionName; - @ObfuscatedName("di") + @ObfuscatedName("dg") @Export("hasListener") public boolean hasListener; - @ObfuscatedName("dn") + @ObfuscatedName("dh") @Export("onLoad") public Object[] onLoad; - @ObfuscatedName("ds") + @ObfuscatedName("dl") @Export("onClick") public Object[] onClick; - @ObfuscatedName("dh") + @ObfuscatedName("da") @Export("onClickRepeat") public Object[] onClickRepeat; - @ObfuscatedName("dt") + @ObfuscatedName("dp") @Export("onRelease") public Object[] onRelease; - @ObfuscatedName("dz") + @ObfuscatedName("ds") @Export("onHold") public Object[] onHold; - @ObfuscatedName("dr") + @ObfuscatedName("db") @Export("onMouseOver") public Object[] onMouseOver; - @ObfuscatedName("dl") + @ObfuscatedName("dn") @Export("onMouseRepeat") public Object[] onMouseRepeat; - @ObfuscatedName("db") + @ObfuscatedName("dt") @Export("onMouseLeave") public Object[] onMouseLeave; - @ObfuscatedName("da") + @ObfuscatedName("dc") @Export("onDrag") public Object[] onDrag; - @ObfuscatedName("dq") + @ObfuscatedName("dd") @Export("onDragComplete") public Object[] onDragComplete; - @ObfuscatedName("do") + @ObfuscatedName("dv") @Export("onTargetEnter") public Object[] onTargetEnter; @ObfuscatedName("du") @Export("onTargetLeave") public Object[] onTargetLeave; - @ObfuscatedName("dv") + @ObfuscatedName("dq") @Export("onVarTransmit") public Object[] onVarTransmit; - @ObfuscatedName("dg") + @ObfuscatedName("dj") @Export("varTransmitTriggers") public int[] varTransmitTriggers; - @ObfuscatedName("dm") + @ObfuscatedName("dy") @Export("onInvTransmit") public Object[] onInvTransmit; - @ObfuscatedName("df") + @ObfuscatedName("dw") @Export("invTransmitTriggers") public int[] invTransmitTriggers; - @ObfuscatedName("dd") + @ObfuscatedName("dz") @Export("onStatTransmit") public Object[] onStatTransmit; - @ObfuscatedName("dy") + @ObfuscatedName("dm") @Export("statTransmitTriggers") public int[] statTransmitTriggers; - @ObfuscatedName("eg") + @ObfuscatedName("et") @Export("onTimer") public Object[] onTimer; - @ObfuscatedName("ey") + @ObfuscatedName("ef") @Export("onOp") public Object[] onOp; - @ObfuscatedName("ec") + @ObfuscatedName("ek") @Export("onScroll") public Object[] onScroll; - @ObfuscatedName("el") + @ObfuscatedName("ej") @Export("onChatTransmit") public Object[] onChatTransmit; - @ObfuscatedName("em") + @ObfuscatedName("ew") @Export("onKey") public Object[] onKey; - @ObfuscatedName("ee") + @ObfuscatedName("ep") @Export("onFriendTransmit") public Object[] onFriendTransmit; - @ObfuscatedName("eu") + @ObfuscatedName("er") @Export("onClanTransmit") public Object[] onClanTransmit; - @ObfuscatedName("ea") + @ObfuscatedName("es") @Export("onMiscTransmit") public Object[] onMiscTransmit; - @ObfuscatedName("er") + @ObfuscatedName("eq") @Export("onDialogAbort") public Object[] onDialogAbort; - @ObfuscatedName("ek") + @ObfuscatedName("ev") @Export("onSubChange") public Object[] onSubChange; - @ObfuscatedName("ej") + @ObfuscatedName("en") @Export("onResize") public Object[] onResize; - @ObfuscatedName("et") + @ObfuscatedName("ee") @Export("onStockTransmit") public Object[] onStockTransmit; - @ObfuscatedName("eh") - public Object[] field2689; - @ObfuscatedName("ew") + @ObfuscatedName("el") + public Object[] field2562; + @ObfuscatedName("eo") @Export("cs1Instructions") public int[][] cs1Instructions; - @ObfuscatedName("ez") + @ObfuscatedName("ex") @Export("cs1Comparisons") public int[] cs1Comparisons; - @ObfuscatedName("ef") + @ObfuscatedName("ei") @Export("cs1ComparisonValues") public int[] cs1ComparisonValues; - @ObfuscatedName("ex") + @ObfuscatedName("eg") @ObfuscatedGetter( - intValue = -453666205 + intValue = -131581019 ) @Export("mouseOverRedirect") public int mouseOverRedirect; - @ObfuscatedName("ep") + @ObfuscatedName("ec") @Export("spellName") public String spellName; - @ObfuscatedName("ev") + @ObfuscatedName("eh") @Export("buttonText") public String buttonText; - @ObfuscatedName("eo") + @ObfuscatedName("eu") @Export("itemIds") public int[] itemIds; - @ObfuscatedName("ei") + @ObfuscatedName("ea") @Export("itemQuantities") public int[] itemQuantities; - @ObfuscatedName("en") + @ObfuscatedName("ez") @ObfuscatedGetter( - intValue = -741280037 + intValue = 1299822723 ) @Export("itemId") public int itemId; - @ObfuscatedName("eb") + @ObfuscatedName("ed") @ObfuscatedGetter( - intValue = -1517426203 + intValue = 1473504869 ) @Export("itemQuantity") public int itemQuantity; - @ObfuscatedName("es") + @ObfuscatedName("ey") @ObfuscatedGetter( - intValue = 41842763 + intValue = 1336103723 ) @Export("modelFrame") public int modelFrame; - @ObfuscatedName("ed") + @ObfuscatedName("eb") @ObfuscatedGetter( - intValue = -1337602571 + intValue = 699084427 ) @Export("modelFrameCycle") public int modelFrameCycle; - @ObfuscatedName("eq") + @ObfuscatedName("em") @ObfuscatedSignature( - signature = "[Lhl;" + signature = "[Lha;" ) @Export("children") public Widget[] children; - @ObfuscatedName("fe") + @ObfuscatedName("fd") @Export("containsMouse") public boolean containsMouse; - @ObfuscatedName("fl") + @ObfuscatedName("ff") @Export("isClicked") public boolean isClicked; - @ObfuscatedName("fj") + @ObfuscatedName("fe") @ObfuscatedGetter( - intValue = 1602512459 + intValue = -871911491 ) - public int field2631; + public int field2583; + @ObfuscatedName("fk") + @ObfuscatedGetter( + intValue = 629520423 + ) + public int field2685; @ObfuscatedName("fv") @ObfuscatedGetter( - intValue = 2143092137 + intValue = 1203722621 ) - public int field2652; - @ObfuscatedName("fx") + public int field2686; + @ObfuscatedName("fo") @ObfuscatedGetter( - intValue = -24022081 + intValue = -1940308273 ) - public int field2585; - @ObfuscatedName("fm") + public int field2687; + @ObfuscatedName("fq") @ObfuscatedGetter( - intValue = -620656701 - ) - public int field2565; - @ObfuscatedName("fc") - @ObfuscatedGetter( - intValue = 405715237 + intValue = 1802978635 ) @Export("rootIndex") public int rootIndex; - @ObfuscatedName("fz") + @ObfuscatedName("fn") @ObfuscatedGetter( - intValue = -1777882267 + intValue = 1843642963 ) @Export("cycle") public int cycle; - @ObfuscatedName("fi") - public int[] field2695; - @ObfuscatedName("fo") + @ObfuscatedName("fy") + public int[] field2655; + @ObfuscatedName("fu") @Export("noClickThrough") public boolean noClickThrough; - @ObfuscatedName("fu") + @ObfuscatedName("fl") @Export("noScrollThrough") public boolean noScrollThrough; - @ObfuscatedName("fs") - public boolean field2719; + @ObfuscatedName("fr") + public boolean field2602; static { Widget_cachedSprites = new EvictingDualNodeHashTable(200); Widget_cachedModels = new EvictingDualNodeHashTable(50); Widget_cachedFonts = new EvictingDualNodeHashTable(20); Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(8); - field2647 = false; + field2549 = false; } public Widget() { @@ -712,8 +706,8 @@ public class Widget extends Node { this.y = 0; this.width = 0; this.height = 0; - this.field2594 = 1; - this.field2694 = 1; + this.field2617 = 1; + this.field2569 = 1; this.parentId = -1; this.isHidden = false; this.scrollX = 0; @@ -729,7 +723,7 @@ public class Widget extends Node { this.transparencyTop = 0; this.transparencyBot = 0; this.lineWid = 1; - this.field2709 = false; + this.field2676 = false; this.spriteId2 = -1; this.spriteId = -1; this.spriteAngle = 0; @@ -748,8 +742,8 @@ public class Widget extends Node { this.modelAngleY = 0; this.modelAngleZ = 0; this.modelZoom = 100; - this.field2711 = 0; - this.field2633 = 0; + this.field2645 = 0; + this.field2607 = 0; this.modelOrthog = false; this.modelTransparency = false; this.itemQuantityMode = 2; @@ -763,7 +757,7 @@ public class Widget extends Node { this.paddingX = 0; this.paddingY = 0; this.clickMask = 0; - this.field2651 = false; + this.field2625 = false; this.dataText = ""; this.parent = null; this.dragZoneSize = 0; @@ -780,21 +774,21 @@ public class Widget extends Node { this.modelFrameCycle = 0; this.containsMouse = false; this.isClicked = false; - this.field2631 = -1; - this.field2652 = 0; - this.field2585 = 0; - this.field2565 = 0; + this.field2583 = -1; + this.field2685 = 0; + this.field2686 = 0; + this.field2687 = 0; this.rootIndex = -1; this.cycle = -1; this.noClickThrough = false; this.noScrollThrough = false; - this.field2719 = false; + this.field2602 = false; } - @ObfuscatedName("z") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(Lkg;B)V", - garbageValue = "39" + signature = "(Lkq;I)V", + garbageValue = "-1975844484" ) @Export("decodeLegacy") void decodeLegacy(Buffer var1) { @@ -979,7 +973,7 @@ public class Widget extends Node { if (this.type == 7) { this.itemIds = new int[this.rawWidth * this.rawHeight]; - this.itemQuantities = new int[this.rawWidth * this.rawHeight]; + this.itemQuantities = new int[this.rawHeight * this.rawWidth]; this.textXAlignment = var1.readUnsignedByte(); this.fontId = var1.readUnsignedShort(); if (this.fontId == 65535) { @@ -1048,10 +1042,10 @@ public class Widget extends Node { } - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Lkg;B)V", - garbageValue = "77" + signature = "(Lkq;B)V", + garbageValue = "-13" ) @Export("decode") void decode(Buffer var1) { @@ -1118,7 +1112,7 @@ public class Widget extends Node { this.modelOrthog = var1.readUnsignedByte() == 1; var1.readUnsignedShort(); if (this.widthAlignment != 0) { - this.field2711 = var1.readUnsignedShort(); + this.field2645 = var1.readUnsignedShort(); } if (this.heightAlignment != 0) { @@ -1149,7 +1143,7 @@ public class Widget extends Node { if (this.type == 9) { this.lineWid = var1.readUnsignedByte(); this.color = var1.readInt(); - this.field2709 = var1.readUnsignedByte() == 1; + this.field2676 = var1.readUnsignedByte() == 1; } this.clickMask = var1.readMedium(); @@ -1190,10 +1184,10 @@ public class Widget extends Node { this.statTransmitTriggers = this.readListenerTriggers(var1); } - @ObfuscatedName("h") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lkg;I)[Ljava/lang/Object;", - garbageValue = "2111872716" + signature = "(Lkq;B)[Ljava/lang/Object;", + garbageValue = "19" ) @Export("readListener") Object[] readListener(Buffer var1) { @@ -1217,10 +1211,10 @@ public class Widget extends Node { } } - @ObfuscatedName("y") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(Lkg;B)[I", - garbageValue = "-106" + signature = "(Lkq;I)[I", + garbageValue = "-417686868" ) @Export("readListenerTriggers") int[] readListenerTriggers(Buffer var1) { @@ -1238,10 +1232,10 @@ public class Widget extends Node { } } - @ObfuscatedName("w") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "36" + signature = "(III)V", + garbageValue = "1303509958" ) @Export("swapItems") public void swapItems(int var1, int var2) { @@ -1253,14 +1247,14 @@ public class Widget extends Node { this.itemQuantities[var1] = var3; } - @ObfuscatedName("i") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(ZI)Lln;", - garbageValue = "-988203301" + signature = "(ZB)Lls;", + garbageValue = "-9" ) @Export("getSprite") public Sprite getSprite(boolean var1) { - field2647 = false; + field2549 = false; int var2; if (var1) { var2 = this.spriteId; @@ -1271,14 +1265,14 @@ public class Widget extends Node { if (var2 == -1) { return null; } else { - long var3 = ((this.spriteFlipV ? 1L : 0L) << 38) + (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.spriteShadow << 40); + long var3 = ((this.spriteFlipH ? 1L : 0L) << 39) + ((this.spriteFlipV ? 1L : 0L) << 38) + (long)var2 + ((long)this.outline << 36) + ((long)this.spriteShadow << 40); Sprite var5 = (Sprite)Widget_cachedSprites.get(var3); if (var5 != null) { return var5; } else { - var5 = class288.SpriteBuffer_getSprite(Widget_spritesArchive, var2, 0); + var5 = FloorUnderlayDefinition.SpriteBuffer_getSprite(BoundaryObject.Widget_spritesArchive, var2, 0); if (var5 == null) { - field2647 = true; + field2549 = true; return null; } else { if (this.spriteFlipV) { @@ -1312,14 +1306,14 @@ public class Widget extends Node { } } - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(S)Lky;", - garbageValue = "12527" + signature = "(I)Lko;", + garbageValue = "-2105081267" ) @Export("getFont") public Font getFont() { - field2647 = false; + field2549 = false; if (this.fontId == -1) { return null; } else { @@ -1327,11 +1321,11 @@ public class Widget extends Node { if (var1 != null) { return var1; } else { - var1 = class60.method1195(Widget_spritesArchive, Widget_fontsArchive, this.fontId, 0); + var1 = class14.method160(BoundaryObject.Widget_spritesArchive, MilliClock.Widget_fontsArchive, this.fontId, 0); if (var1 != null) { Widget_cachedFonts.put(var1, (long)this.fontId); } else { - field2647 = true; + field2549 = true; } return var1; @@ -1339,14 +1333,14 @@ public class Widget extends Node { } } - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(II)Lln;", - garbageValue = "-121704848" + signature = "(II)Lls;", + garbageValue = "517596117" ) @Export("getInventorySprite") public Sprite getInventorySprite(int var1) { - field2647 = false; + field2549 = false; if (var1 >= 0 && var1 < this.inventorySprites.length) { int var2 = this.inventorySprites[var1]; if (var2 == -1) { @@ -1356,11 +1350,11 @@ public class Widget extends Node { if (var3 != null) { return var3; } else { - var3 = class288.SpriteBuffer_getSprite(Widget_spritesArchive, var2, 0); + var3 = FloorUnderlayDefinition.SpriteBuffer_getSprite(BoundaryObject.Widget_spritesArchive, var2, 0); if (var3 != null) { Widget_cachedSprites.put(var3, (long)var2); } else { - field2647 = true; + field2549 = true; } return var3; @@ -1371,14 +1365,14 @@ public class Widget extends Node { } } - @ObfuscatedName("o") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Liy;IZLhd;I)Ldf;", - garbageValue = "-527330743" + signature = "(Liv;IZLhh;I)Ldw;", + garbageValue = "-3726019" ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerAppearance var4) { - field2647 = false; + field2549 = false; int var5; int var6; if (var3) { @@ -1398,9 +1392,9 @@ public class Widget extends Node { if (var7 == null) { ModelData var8; if (var5 == 1) { - var8 = ModelData.ModelData_get(FriendLoginUpdate.Widget_modelsArchive, var6, 0); + var8 = ModelData.ModelData_get(Widget_modelsArchive, var6, 0); if (var8 == null) { - field2647 = true; + field2549 = true; return null; } @@ -1408,9 +1402,9 @@ public class Widget extends Node { } if (var5 == 2) { - var8 = VarcInt.getNpcDefinition(var6).getModelData(); + var8 = AbstractUserComparator.getNpcDefinition(var6).getModelData(); if (var8 == null) { - field2647 = true; + field2549 = true; return null; } @@ -1424,7 +1418,7 @@ public class Widget extends Node { var8 = var4.getModelData(); if (var8 == null) { - field2647 = true; + field2549 = true; return null; } @@ -1432,14 +1426,14 @@ public class Widget extends Node { } if (var5 == 4) { - ItemDefinition var9 = Interpreter.ItemDefinition_get(var6); + ItemDefinition var9 = PacketBufferNode.ItemDefinition_get(var6); var8 = var9.getModelData(10); if (var8 == null) { - field2647 = true; + field2549 = true; return null; } - var7 = var8.toModel(var9.ambient + 64, var9.contrast + 768, -50, -10, -50); + var7 = var8.toModel(var9.ambient + 64, var9.contrast * 5 + 768, -50, -10, -50); } Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16))); @@ -1453,10 +1447,10 @@ public class Widget extends Node { } } - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(ZI)Lhn;", - garbageValue = "-92649703" + signature = "(ZB)Lhy;", + garbageValue = "127" ) @Export("getSpriteMask") public SpriteMask getSpriteMask(boolean var1) { @@ -1468,7 +1462,7 @@ public class Widget extends Node { if (var2 == -1) { return null; } else { - long var3 = ((this.spriteFlipH ? 1L : 0L) << 39) + ((this.spriteFlipV ? 1L : 0L) << 38) + ((long)this.outline << 36) + (long)var2 + ((long)this.spriteShadow << 40); + long var3 = ((long)this.spriteShadow << 40) + ((long)this.outline << 36) + (long)var2 + ((this.spriteFlipV ? 1L : 0L) << 38) + ((this.spriteFlipH ? 1L : 0L) << 39); SpriteMask var5 = (SpriteMask)Widget_cachedSpriteMasks.get(var3); if (var5 != null) { return var5; @@ -1512,10 +1506,10 @@ public class Widget extends Node { } } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(ILjava/lang/String;I)V", - garbageValue = "-663551109" + garbageValue = "1803915534" ) @Export("setAction") public void setAction(int var1, String var2) { diff --git a/runescape-client/src/main/java/World.java b/runescape-client/src/main/java/World.java index c2215c0ad2..cbf77f79e5 100644 --- a/runescape-client/src/main/java/World.java +++ b/runescape-client/src/main/java/World.java @@ -4,60 +4,60 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bp") +@ObfuscatedName("be") @Implements("World") public class World { - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -2124078527 + intValue = 1287165751 ) @Export("World_count") static int World_count; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -92333775 + intValue = 583854419 ) @Export("World_listCount") static int World_listCount; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("World_sortOption2") static int[] World_sortOption2; - @ObfuscatedName("w") + @ObfuscatedName("a") @Export("World_sortOption1") static int[] World_sortOption1; - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 176871977 + intValue = -1519088655 ) @Export("id") int id; - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 767874413 + intValue = 1545527697 ) @Export("properties") int properties; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1258994719 + intValue = 1058065385 ) @Export("population") int population; - @ObfuscatedName("e") + @ObfuscatedName("k") @Export("host") String host; - @ObfuscatedName("n") + @ObfuscatedName("s") @Export("activity") String activity; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1182748769 + intValue = -511848303 ) @Export("location") int location; - @ObfuscatedName("c") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1616243125 + intValue = -1131143169 ) @Export("index") int index; @@ -72,29 +72,29 @@ public class World { World() { } - @ObfuscatedName("i") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-946882921" + signature = "(S)Z", + garbageValue = "-26711" ) @Export("isMembersOnly") boolean isMembersOnly() { return (1 & this.properties) != 0; } - @ObfuscatedName("k") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "-32" + signature = "(I)Z", + garbageValue = "-1453157769" ) - boolean method1802() { + boolean method1782() { return (2 & this.properties) != 0; } - @ObfuscatedName("x") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1605869890" + garbageValue = "-2060131341" ) @Export("isPvp") boolean isPvp() { @@ -104,203 +104,60 @@ public class World { @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "1798300394" + garbageValue = "1753772408" ) - boolean method1785() { + boolean method1780() { return (8 & this.properties) != 0; } - @ObfuscatedName("e") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "0" + signature = "(I)Z", + garbageValue = "1313707308" ) @Export("isDeadman") boolean isDeadman() { return (536870912 & this.properties) != 0; } - @ObfuscatedName("n") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-758716073" + garbageValue = "-1940654935" ) @Export("isBeta") boolean isBeta() { return (33554432 & this.properties) != 0; } - @ObfuscatedName("c") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "5" + signature = "(I)Z", + garbageValue = "-44264871" ) - boolean method1788() { + boolean method1775() { return (1073741824 & this.properties) != 0; } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(ILhf;IIIZI)V", - garbageValue = "592972731" + signature = "(IB)Lik;", + garbageValue = "20" ) - public static void method1819(int var0, AbstractArchive var1, int var2, int var3, int var4, boolean var5) { - class197.field2411 = 1; - class197.musicTrackArchive = var1; - UrlRequester.musicTrackGroupId = var2; - UserComparator7.musicTrackFileId = var3; - class197.musicTrackVolume = var4; - ArchiveLoader.musicTrackBoolean = var5; - class335.field4014 = var0; - } - - @ObfuscatedName("hd") - @ObfuscatedSignature( - signature = "(IIIIII)V", - garbageValue = "1377503152" - ) - @Export("drawObject") - static final void drawObject(int var0, int var1, int var2, int var3, int var4) { - long var5 = class2.scene.getBoundaryObjectTag(var0, var1, var2); - int var7; - int var8; - int var9; - int var10; - int var12; - int var13; - if (0L != var5) { - var7 = class2.scene.getObjectFlags(var0, var1, var2, var5); - var8 = var7 >> 6 & 3; - var9 = var7 & 31; - var10 = var3; - if (WallDecoration.method3340(var5)) { - var10 = var4; + @Export("getEnum") + public static EnumDefinition getEnum(int var0) { + EnumDefinition var1 = (EnumDefinition)EnumDefinition.EnumDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = class286.EnumDefinition_archive.takeFile(8, var0); + var1 = new EnumDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); } - int[] var11 = Interpreter.sceneMinimapSprite.pixels; - var12 = var1 * 4 + (103 - var2) * 2048 + 24624; - var13 = ItemContainer.Entity_unpackID(var5); - ObjectDefinition var14 = Occluder.getObjectDefinition(var13); - if (var14.mapSceneId != -1) { - IndexedSprite var15 = GrandExchangeOfferTotalQuantityComparator.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, (104 - var2 - var14.sizeY) * 4 + var17 + 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; - } - } - } + EnumDefinition.EnumDefinition_cached.put(var1, (long)var0); + return var1; } - - var5 = class2.scene.getGameObjectTag(var0, var1, var2); - if (0L != var5) { - var7 = class2.scene.getObjectFlags(var0, var1, var2, var5); - var8 = var7 >> 6 & 3; - var9 = var7 & 31; - var10 = ItemContainer.Entity_unpackID(var5); - ObjectDefinition var24 = Occluder.getObjectDefinition(var10); - int var19; - if (var24.mapSceneId != -1) { - IndexedSprite var18 = GrandExchangeOfferTotalQuantityComparator.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 (WallDecoration.method3340(var5)) { - var12 = 15597568; - } - - int[] var23 = Interpreter.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 = class2.scene.getFloorDecorationTag(var0, var1, var2); - if (0L != var5) { - var7 = ItemContainer.Entity_unpackID(var5); - ObjectDefinition var20 = Occluder.getObjectDefinition(var7); - if (var20.mapSceneId != -1) { - IndexedSprite var21 = GrandExchangeOfferTotalQuantityComparator.mapSceneSprites[var20.mapSceneId]; - if (var21 != null) { - var10 = (var20.sizeX * 4 - var21.subWidth) / 2; - int var22 = (var20.sizeY * 4 - var21.subHeight) / 2; - var21.drawAt(var10 + var1 * 4 + 48, (104 - var2 - var20.sizeY) * 4 + var22 + 48); - } - } - } - } } diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java index 9535b54151..e55595ca52 100644 --- a/runescape-client/src/main/java/WorldMap.java +++ b/runescape-client/src/main/java/WorldMap.java @@ -10,278 +10,278 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lo") +@ObfuscatedName("ld") @Implements("WorldMap") public class WorldMap { - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lka;" + signature = "Lkk;" ) @Export("fontNameVerdana11") static final FontName fontNameVerdana11; - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lka;" + signature = "Lkk;" ) @Export("fontNameVerdana13") static final FontName fontNameVerdana13; - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lka;" + signature = "Lkk;" ) @Export("fontNameVerdana15") static final FontName fontNameVerdana15; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lhf;" + signature = "Lhz;" ) @Export("WorldMap_archive") AbstractArchive WorldMap_archive; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lhf;" + signature = "Lhz;" ) @Export("WorldMap_geographyArchive") AbstractArchive WorldMap_geographyArchive; - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Lhf;" + signature = "Lhz;" ) @Export("WorldMap_groundArchive") AbstractArchive WorldMap_groundArchive; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Lky;" + signature = "Lko;" ) @Export("font") Font font; - @ObfuscatedName("e") + @ObfuscatedName("k") @Export("fonts") HashMap fonts; - @ObfuscatedName("n") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "[Llm;" + signature = "[Lli;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("details") HashMap details; - @ObfuscatedName("c") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Laf;" + signature = "Laa;" ) @Export("mainMapArea") WorldMapArea mainMapArea; - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Laf;" + signature = "Laa;" ) @Export("currentMapArea") WorldMapArea currentMapArea; - @ObfuscatedName("d") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Laf;" + signature = "Laa;" ) - WorldMapArea field3985; - @ObfuscatedName("s") + WorldMapArea field3959; + @ObfuscatedName("u") @ObfuscatedSignature( signature = "Lar;" ) @Export("worldMapManager") WorldMapManager worldMapManager; - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Llr;" + signature = "Llm;" ) @Export("cacheLoader") WorldMapArchiveLoader cacheLoader; - @ObfuscatedName("m") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 415581719 + intValue = 769697825 ) @Export("centerTileX") int centerTileX; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 748843563 + intValue = 1650708007 ) @Export("centerTileY") int centerTileY; - @ObfuscatedName("q") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1376756297 + intValue = -1898318821 ) @Export("worldMapTargetX") int worldMapTargetX; - @ObfuscatedName("l") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1002756295 + intValue = 1415231623 ) @Export("worldMapTargetY") int worldMapTargetY; - @ObfuscatedName("j") + @ObfuscatedName("q") @Export("zoom") float zoom; - @ObfuscatedName("af") + @ObfuscatedName("aa") @Export("zoomTarget") float zoomTarget; - @ObfuscatedName("ad") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 1048089791 + intValue = -1100831923 ) @Export("worldMapDisplayWidth") int worldMapDisplayWidth; - @ObfuscatedName("am") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = 1251324601 + intValue = -480393575 ) @Export("worldMapDisplayHeight") int worldMapDisplayHeight; - @ObfuscatedName("ai") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -486711031 + intValue = -971268509 ) @Export("worldMapDisplayX") int worldMapDisplayX; - @ObfuscatedName("ag") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 638623411 + intValue = -763154973 ) @Export("worldMapDisplayY") int worldMapDisplayY; - @ObfuscatedName("ao") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = 1650876741 + intValue = -258302625 ) @Export("maxFlashCount") int maxFlashCount; - @ObfuscatedName("aw") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = -281706079 + intValue = -1236137625 ) @Export("cyclesPerFlash") int cyclesPerFlash; - @ObfuscatedName("ak") + @ObfuscatedName("aq") @Export("perpetualFlash") boolean perpetualFlash; - @ObfuscatedName("aa") + @ObfuscatedName("ao") @Export("flashingElements") HashSet flashingElements; - @ObfuscatedName("ab") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = 2112542559 + intValue = -458343583 ) @Export("flashCount") int flashCount; @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -903079399 + intValue = -710941377 ) @Export("flashCycle") int flashCycle; - @ObfuscatedName("av") - @ObfuscatedGetter( - intValue = -178866611 - ) - int field3997; - @ObfuscatedName("aq") - @ObfuscatedGetter( - intValue = 1461367677 - ) - int field3979; - @ObfuscatedName("ac") - @ObfuscatedGetter( - intValue = 992436699 - ) - int field3966; @ObfuscatedName("az") @ObfuscatedGetter( - intValue = -912937739 + intValue = 634143331 ) - int field3981; - @ObfuscatedName("at") + int field3978; + @ObfuscatedName("ay") @ObfuscatedGetter( - longValue = -6268204185422691147L + intValue = -874414913 ) - long field3982; - @ObfuscatedName("ae") + int field3979; + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 967500379 + intValue = 1920735327 ) int field3980; - @ObfuscatedName("aj") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -1249817665 + intValue = 1563619535 + ) + int field3992; + @ObfuscatedName("al") + @ObfuscatedGetter( + longValue = 4789234822527169759L + ) + long field3952; + @ObfuscatedName("ae") + @ObfuscatedGetter( + intValue = -1313666647 + ) + int field3982; + @ObfuscatedName("ad") + @ObfuscatedGetter( + intValue = 914367019 ) int field3984; - @ObfuscatedName("ap") - boolean field3957; - @ObfuscatedName("ay") + @ObfuscatedName("aj") + boolean field3981; + @ObfuscatedName("af") @Export("enabledElements") HashSet enabledElements; - @ObfuscatedName("ax") + @ObfuscatedName("ap") @Export("enabledCategories") HashSet enabledCategories; - @ObfuscatedName("au") + @ObfuscatedName("ai") @Export("enabledElementIds") HashSet enabledElementIds; - @ObfuscatedName("as") + @ObfuscatedName("am") HashSet field3989; - @ObfuscatedName("ah") + @ObfuscatedName("ab") @Export("elementsDisabled") boolean elementsDisabled; - @ObfuscatedName("bi") + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = -1272343305 + intValue = -1635351133 ) int field3991; - @ObfuscatedName("bx") + @ObfuscatedName("bw") @Export("menuOpcodes") final int[] menuOpcodes; - @ObfuscatedName("bu") - List field3953; - @ObfuscatedName("bd") + @ObfuscatedName("bk") + List field3946; + @ObfuscatedName("bl") @Export("iconIterator") Iterator iconIterator; - @ObfuscatedName("bn") + @ObfuscatedName("bq") HashSet field3995; - @ObfuscatedName("bj") + @ObfuscatedName("bx") @ObfuscatedSignature( - signature = "Lhx;" + signature = "Lht;" ) @Export("mouseCoord") Coord mouseCoord; - @ObfuscatedName("bm") + @ObfuscatedName("bc") @Export("showCoord") public boolean showCoord; - @ObfuscatedName("bq") + @ObfuscatedName("by") @ObfuscatedSignature( - signature = "Lln;" + signature = "Lls;" ) @Export("sprite") Sprite sprite; - @ObfuscatedName("bf") + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = -1436249859 + intValue = 366608429 ) @Export("cachedPixelsPerTile") int cachedPixelsPerTile; - @ObfuscatedName("by") + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = 1279936485 + intValue = 1813935141 ) @Export("minCachedTileX") int minCachedTileX; - @ObfuscatedName("br") + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = -1058135439 + intValue = -3401919 ) @Export("minCachedTileY") int minCachedTileY; - @ObfuscatedName("ba") + @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = 206636117 + intValue = 842619581 ) int field4002; @@ -304,11 +304,11 @@ public class WorldMap { this.flashingElements = null; this.flashCount = -1; this.flashCycle = -1; - this.field3997 = -1; + this.field3978 = -1; this.field3979 = -1; - this.field3966 = -1; - this.field3981 = -1; - this.field3957 = true; + this.field3980 = -1; + this.field3992 = -1; + this.field3981 = true; this.enabledElements = new HashSet(); this.enabledCategories = new HashSet(); this.enabledElementIds = new HashSet(); @@ -324,10 +324,10 @@ public class WorldMap { this.field4002 = -1; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Lhf;Lhf;Lhf;Lky;Ljava/util/HashMap;[Llm;B)V", - garbageValue = "-12" + signature = "(Lhz;Lhz;Lhz;Lko;Ljava/util/HashMap;[Lli;I)V", + garbageValue = "1728699917" ) @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.field304.name); + int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field291.name); int[] var8 = this.WorldMap_archive.getGroupFileIds(var7); this.details = new HashMap(var8.length); @@ -356,22 +356,22 @@ public class WorldMap { } this.setCurrentMapArea(this.mainMapArea); - this.field3985 = null; + this.field3959 = null; } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "2075872374" + garbageValue = "-1661861008" ) - public void method6376() { + public void method6357() { WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "(IIZIIIII)V", - garbageValue = "-1854854899" + garbageValue = "46505249" ) @Export("onCycle") public void onCycle(int var1, int var2, boolean var3, int var4, int var5, int var6, int var7) { @@ -381,14 +381,14 @@ public class WorldMap { if (var3) { int var8 = (int)Math.ceil((double)((float)var6 / this.zoom)); int var9 = (int)Math.ceil((double)((float)var7 / this.zoom)); - List var10 = this.worldMapManager.method645(this.centerTileX - var8 / 2 - 1, this.centerTileY - var9 / 2 - 1, var8 / 2 + this.centerTileX + 1, var9 / 2 + this.centerTileY + 1, var4, var5, var6, var7, var1, var2); + List var10 = this.worldMapManager.method647(this.centerTileX - var8 / 2 - 1, this.centerTileY - var9 / 2 - 1, var8 / 2 + this.centerTileX + 1, var9 / 2 + this.centerTileY + 1, var4, var5, var6, var7, var1, var2); HashSet var11 = new HashSet(); Iterator var12; AbstractWorldMapIcon var13; ScriptEvent var14; WorldMapEvent var15; - for (var12 = var10.iterator(); var12.hasNext(); WorldMapLabel.runScriptEvent(var14)) { + for (var12 = var10.iterator(); var12.hasNext(); Client.runScriptEvent(var14)) { var13 = (AbstractWorldMapIcon)var12.next(); var11.add(var13); var14 = new ScriptEvent(); @@ -410,7 +410,7 @@ public class WorldMap { var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); var14.setArgs(new Object[]{var15, var1, var2}); var14.setType(16); - WorldMapLabel.runScriptEvent(var14); + Client.runScriptEvent(var14); } } @@ -419,63 +419,74 @@ public class WorldMap { } } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(IIZZI)V", - garbageValue = "-788666076" + signature = "(IIZZB)V", + garbageValue = "-96" ) - public void method6378(int var1, int var2, boolean var3, boolean var4) { - long var5 = TaskHandler.currentTimeMillis(); - this.method6379(var1, var2, var4, var5); + public void method6359(int var1, int var2, boolean var3, boolean var4) { + long var5 = WorldMapID.currentTimeMillis(); + this.method6423(var1, var2, var4, var5); if (!this.hasTarget() && (var4 || var3)) { if (var4) { - this.field3966 = var1; - this.field3981 = var2; - this.field3997 = this.centerTileX; + this.field3980 = var1; + this.field3992 = var2; + this.field3978 = this.centerTileX; this.field3979 = this.centerTileY; } - if (this.field3997 != -1) { - int var7 = var1 - this.field3966; - int var8 = var2 - this.field3981; - this.setWorldMapPosition(this.field3997 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field3979, false); + if (this.field3978 != -1) { + int var7 = var1 - this.field3980; + int var8 = var2 - this.field3992; + this.setWorldMapPosition(this.field3978 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field3979, false); } } else { - this.method6383(); + this.method6532(); } if (var4) { - this.field3982 = var5; - this.field3980 = var1; + this.field3952 = var5; + this.field3982 = var1; this.field3984 = var2; } } - @ObfuscatedName("z") - void method6379(int var1, int var2, boolean var3, long var4) { + @ObfuscatedName("p") + void method6423(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) { - if (WorldMapSection0.method254() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { - Clock.method3555(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); + boolean var8 = Client.staffModLevel >= 2; + int var10; + int var11; + if (var8 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { + int var14 = this.mouseCoord.x; + var10 = this.mouseCoord.y; + var11 = this.mouseCoord.plane; + PacketBufferNode var12 = class2.getPacketBufferNode(ClientPacket.field2251, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeIntME(var14); + var12.packetBuffer.writeShortLE(0); + var12.packetBuffer.writeIntME(var10); + var12.packetBuffer.method5569(var11); + Client.packetWriter.addNode(var12); } else { - boolean var8 = true; - if (this.field3957) { - int var9 = var1 - this.field3980; - int var10 = var2 - this.field3984; - if (var4 - this.field3982 > 500L || var9 < -25 || var9 > 25 || var10 < -25 || var10 > 25) { - var8 = false; + boolean var9 = true; + if (this.field3981) { + var10 = var1 - this.field3982; + var11 = var2 - this.field3984; + if (var4 - this.field3952 > 500L || var10 < -25 || var10 > 25 || var11 < -25 || var11 > 25) { + var9 = false; } } - if (var8) { - PacketBufferNode var11 = ModelData0.getPacketBufferNode(ClientPacket.field2291, Client.packetWriter.isaacCipher); - var11.packetBuffer.method5647(this.mouseCoord.packed()); - Client.packetWriter.addNode(var11); - this.field3982 = 0L; + if (var9) { + PacketBufferNode var13 = class2.getPacketBufferNode(ClientPacket.field2210, Client.packetWriter.isaacCipher); + var13.packetBuffer.writeShortLE(this.mouseCoord.packed()); + Client.packetWriter.addNode(var13); + this.field3952 = 0L; } } } @@ -485,18 +496,18 @@ public class WorldMap { } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-30" + signature = "(I)V", + garbageValue = "826413742" ) @Export("smoothZoom") void smoothZoom() { - if (InvDefinition.field3210 != null) { + if (class215.field2534 != null) { this.zoom = this.zoomTarget; } else { if (this.zoom < this.zoomTarget) { - this.zoom = Math.min(this.zoomTarget, this.zoom + this.zoom / 30.0F); + this.zoom = Math.min(this.zoomTarget, this.zoom / 30.0F + this.zoom); } if (this.zoom > this.zoomTarget) { @@ -506,10 +517,10 @@ public class WorldMap { } } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "418852824" + garbageValue = "2135583041" ) @Export("scrollToTarget") void scrollToTarget() { @@ -525,7 +536,7 @@ public class WorldMap { } this.setWorldMapPosition(var1 + this.centerTileX, var2 + this.centerTileY, true); - if (this.centerTileX == this.worldMapTargetX && this.worldMapTargetY == this.centerTileY) { + if (this.worldMapTargetX == this.centerTileX && this.centerTileY == this.worldMapTargetY) { this.worldMapTargetX = -1; this.worldMapTargetY = -1; } @@ -533,48 +544,48 @@ public class WorldMap { } } - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IIZB)V", - garbageValue = "-72" + signature = "(IIZI)V", + garbageValue = "-2141502379" ) @Export("setWorldMapPosition") final void setWorldMapPosition(int var1, int var2, boolean var3) { this.centerTileX = var1; this.centerTileY = var2; - TaskHandler.currentTimeMillis(); + WorldMapID.currentTimeMillis(); if (var3) { - this.method6383(); + this.method6532(); } } - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-93" + signature = "(I)V", + garbageValue = "304166033" ) - final void method6383() { - this.field3981 = -1; - this.field3966 = -1; + final void method6532() { + this.field3992 = -1; + this.field3980 = -1; this.field3979 = -1; - this.field3997 = -1; + this.field3978 = -1; } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1462551902" + garbageValue = "-1744394107" ) @Export("hasTarget") boolean hasTarget() { return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; } - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IIII)Laf;", - garbageValue = "250102276" + signature = "(IIII)Laa;", + garbageValue = "-1136090862" ) @Export("mapAreaAtCoord") public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) { @@ -592,12 +603,12 @@ public class WorldMap { return var5; } - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IIIZB)V", - garbageValue = "118" + signature = "(IIIZI)V", + garbageValue = "2020995373" ) - public void method6381(int var1, int var2, int var3, boolean var4) { + public void method6367(int var1, int var2, int var3, boolean var4) { WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); if (var5 == null) { if (!var4) { @@ -608,8 +619,8 @@ public class WorldMap { } boolean var6 = false; - if (var5 != this.field3985 || var4) { - this.field3985 = var5; + if (var5 != this.field3959 || var4) { + this.field3959 = var5; this.setCurrentMapArea(var5); var6 = true; } @@ -620,10 +631,10 @@ public class WorldMap { } - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "2133824593" + signature = "(IB)V", + garbageValue = "-41" ) @Export("setCurrentMapAreaId") public void setCurrentMapAreaId(int var1) { @@ -634,30 +645,30 @@ public class WorldMap { } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-116541187" + garbageValue = "-1765160144" ) @Export("currentMapAreaId") public int currentMapAreaId() { return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); } - @ObfuscatedName("n") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)Laf;", - garbageValue = "335674701" + signature = "(I)Laa;", + garbageValue = "-987525690" ) @Export("getCurrentMapArea") public WorldMapArea getCurrentMapArea() { return this.currentMapArea; } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Laf;I)V", - garbageValue = "921553646" + signature = "(Laa;B)V", + garbageValue = "0" ) @Export("setCurrentMapArea") void setCurrentMapArea(WorldMapArea var1) { @@ -667,10 +678,10 @@ public class WorldMap { } } - @ObfuscatedName("s") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Laf;I)V", - garbageValue = "1850742503" + signature = "(Laa;I)V", + garbageValue = "-2040877349" ) @Export("initializeWorldMapManager") void initializeWorldMapManager(WorldMapArea var1) { @@ -679,12 +690,12 @@ public class WorldMap { this.cacheLoader.reset(this.currentMapArea.getInternalName()); } - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(Laf;Lhx;Lhx;ZI)V", - garbageValue = "1443129955" + signature = "(Laa;Lht;Lht;ZI)V", + garbageValue = "-118922828" ) - public void method6453(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { + public void method6373(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { if (var1 != null) { if (this.currentMapArea == null || var1 != this.currentMapArea) { this.initializeWorldMapManager(var1); @@ -699,10 +710,10 @@ public class WorldMap { } } - @ObfuscatedName("m") + @ObfuscatedName("h") @ObfuscatedSignature( signature = "(IIII)V", - garbageValue = "34733782" + garbageValue = "1542600271" ) @Export("jump") void jump(int var1, int var2, int var3) { @@ -717,16 +728,16 @@ public class WorldMap { this.worldMapTargetY = -1; this.zoom = this.getZoomFromPercentage(this.currentMapArea.getZoom()); this.zoomTarget = this.zoom; - this.field3953 = null; + this.field3946 = null; this.iconIterator = null; this.worldMapManager.clearIcons(); } } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(IIIIII)V", - garbageValue = "2142283598" + garbageValue = "-87641945" ) @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5) { @@ -760,8 +771,9 @@ public class WorldMap { int var8 = (int)Math.ceil((double)((float)var3 / this.zoom)); int var9 = (int)Math.ceil((double)((float)var4 / this.zoom)); this.worldMapManager.drawTiles(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4); + boolean var10; if (!this.elementsDisabled) { - boolean var10 = false; + var10 = false; if (var5 - this.field3991 > 100) { this.field3991 = var5; var10 = true; @@ -770,8 +782,9 @@ public class WorldMap { this.worldMapManager.drawElements(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4, this.field3989, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); } - this.method6396(var1, var2, var3, var4, var8, var9); - if (WorldMapSection0.method254() && this.showCoord && this.mouseCoord != null) { + this.method6377(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); } @@ -783,18 +796,18 @@ public class WorldMap { } } - @ObfuscatedName("q") + @ObfuscatedName("aa") @ObfuscatedSignature( signature = "(IIIIIII)Z", - garbageValue = "1539911567" + garbageValue = "-341847306" ) - boolean method6517(int var1, int var2, int var3, int var4, int var5, int var6) { + boolean method6514(int var1, int var2, int var3, int var4, int var5, int var6) { if (this.sprite == null) { return true; } else if (this.sprite.subWidth == var1 && this.sprite.subHeight == var2) { if (this.worldMapManager.pixelsPerTile != this.cachedPixelsPerTile) { return true; - } else if (this.field4002 != Client.field863) { + } else if (this.field4002 != Client.field749) { return true; } else if (var3 <= 0 && var4 <= 0) { return var3 + var1 < var5 || var2 + var4 < var6; @@ -806,13 +819,13 @@ public class WorldMap { } } - @ObfuscatedName("l") + @ObfuscatedName("av") @ObfuscatedSignature( signature = "(IIIIIIB)V", - garbageValue = "115" + garbageValue = "-53" ) - void method6396(int var1, int var2, int var3, int var4, int var5, int var6) { - if (InvDefinition.field3210 != null) { + void method6377(int var1, int var2, int var3, int var4, int var5, int var6) { + if (class215.field2534 != null) { int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2); int var8 = var3 + 512; int var9 = var4 + 512; @@ -821,9 +834,9 @@ public class WorldMap { var9 = (int)((float)var9 / var10); int var11 = this.getDisplayX() - var5 / 2 - var7; int var12 = this.getDisplayY() - var6 / 2 - var7; - int var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; + int var13 = var1 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; int var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); - if (this.method6517(var8, var9, var13, var14, var3, var4)) { + if (this.method6514(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 { @@ -833,26 +846,26 @@ public class WorldMap { this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; - InvDefinition.field3210.method4408(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); - this.field4002 = Client.field863; + class215.field2534.method4318(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); + this.field4002 = Client.field749; var13 = var1 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); } Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); - if (var10 == 1.0F) { - this.sprite.method6217(var13, var14, 192); + if (1.0F == var10) { + this.sprite.method6159(var13, var14, 192); } else { - this.sprite.method6220(var13, var14, (int)(var10 * (float)var8), (int)(var10 * (float)var9), 192); + this.sprite.method6162(var13, var14, (int)(var10 * (float)var8), (int)(var10 * (float)var9), 192); } } } - @ObfuscatedName("j") + @ObfuscatedName("aw") @ObfuscatedSignature( signature = "(IIIII)V", - garbageValue = "2021601893" + garbageValue = "-2078512734" ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4) { @@ -868,20 +881,20 @@ public class WorldMap { } } - @ObfuscatedName("ad") + @ObfuscatedName("as") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-1654225345" + signature = "(IB)V", + garbageValue = "3" ) @Export("setZoomPercentage") public void setZoomPercentage(int var1) { this.zoomTarget = this.getZoomFromPercentage(var1); } - @ObfuscatedName("am") + @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "(IIIIII)V", - garbageValue = "-392772529" + signature = "(IIIIIB)V", + garbageValue = "55" ) @Export("drawLoading") void drawLoading(int var1, int var2, int var3, int var4, int var5) { @@ -891,13 +904,13 @@ public class WorldMap { 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); + this.font.drawCentered("Loading...", var7, var8 + var6, -1, -1); } - @ObfuscatedName("ai") + @ObfuscatedName("au") @ObfuscatedSignature( signature = "(II)F", - garbageValue = "2147483647" + garbageValue = "-1442342288" ) @Export("getZoomFromPercentage") float getZoomFromPercentage(int var1) { @@ -914,50 +927,50 @@ public class WorldMap { } } - @ObfuscatedName("ag") + @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1194767053" + signature = "(B)I", + garbageValue = "0" ) @Export("getZoomLevel") public int getZoomLevel() { - if (1.0D == (double)this.zoomTarget) { + if ((double)this.zoomTarget == 1.0D) { return 25; } else if ((double)this.zoomTarget == 1.5D) { return 37; - } else if (2.0D == (double)this.zoomTarget) { + } else if ((double)this.zoomTarget == 2.0D) { return 50; - } else if ((double)this.zoomTarget == 3.0D) { + } else if (3.0D == (double)this.zoomTarget) { return 75; } else { return 4.0D == (double)this.zoomTarget ? 100 : 200; } } - @ObfuscatedName("ao") + @ObfuscatedName("aq") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1827072202" + garbageValue = "-1583418166" ) @Export("loadCache") public void loadCache() { this.cacheLoader.load(); } - @ObfuscatedName("aw") + @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "396230650" + signature = "(B)Z", + garbageValue = "9" ) @Export("isCacheLoaded") public boolean isCacheLoaded() { return this.cacheLoader.isLoaded(); } - @ObfuscatedName("ak") + @ObfuscatedName("an") @ObfuscatedSignature( - signature = "(IB)Laf;", - garbageValue = "-7" + signature = "(II)Laa;", + garbageValue = "-1454558464" ) @Export("getMapArea") public WorldMapArea getMapArea(int var1) { @@ -975,10 +988,10 @@ public class WorldMap { return var3; } - @ObfuscatedName("aa") + @ObfuscatedName("ar") @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "99" + signature = "(III)V", + garbageValue = "-1969437035" ) @Export("setWorldMapPositionTarget") public void setWorldMapPositionTarget(int var1, int var2) { @@ -988,10 +1001,10 @@ public class WorldMap { } } - @ObfuscatedName("ab") + @ObfuscatedName("az") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "-728638330" + garbageValue = "-1231977956" ) @Export("setWorldMapPositionTargetInstant") public void setWorldMapPositionTargetInstant(int var1, int var2) { @@ -1002,10 +1015,10 @@ public class WorldMap { } } - @ObfuscatedName("ar") + @ObfuscatedName("ay") @ObfuscatedSignature( signature = "(IIIB)V", - garbageValue = "-72" + garbageValue = "37" ) @Export("jumpToSourceCoord") public void jumpToSourceCoord(int var1, int var2, int var3) { @@ -1018,10 +1031,10 @@ public class WorldMap { } } - @ObfuscatedName("av") + @ObfuscatedName("ag") @ObfuscatedSignature( signature = "(IIII)V", - garbageValue = "87939973" + garbageValue = "-429166705" ) @Export("jumpToSourceCoordInstant") public void jumpToSourceCoordInstant(int var1, int var2, int var3) { @@ -1034,60 +1047,60 @@ public class WorldMap { } } - @ObfuscatedName("aq") + @ObfuscatedName("ac") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-89" + signature = "(I)I", + garbageValue = "-640061076" ) @Export("getDisplayX") public int getDisplayX() { return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; } - @ObfuscatedName("ac") + @ObfuscatedName("al") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-67" + signature = "(I)I", + garbageValue = "-1240183513" ) @Export("getDisplayY") public int getDisplayY() { return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; } - @ObfuscatedName("az") + @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "(B)Lhx;", - garbageValue = "101" + signature = "(I)Lht;", + garbageValue = "1271020652" ) @Export("getDisplayCoord") public Coord getDisplayCoord() { return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); } - @ObfuscatedName("at") + @ObfuscatedName("ad") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-587716195" + garbageValue = "310550352" ) @Export("getDisplayWith") public int getDisplayWith() { return this.worldMapDisplayWidth; } - @ObfuscatedName("ae") + @ObfuscatedName("aj") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-6" + signature = "(I)I", + garbageValue = "-238486844" ) @Export("getDisplayHeight") public int getDisplayHeight() { return this.worldMapDisplayHeight; } - @ObfuscatedName("aj") + @ObfuscatedName("ax") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-776452419" + garbageValue = "1755019724" ) @Export("setMaxFlashCount") public void setMaxFlashCount(int var1) { @@ -1097,20 +1110,20 @@ public class WorldMap { } - @ObfuscatedName("ap") + @ObfuscatedName("at") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "2112620729" + garbageValue = "1329529501" ) @Export("resetMaxFlashCount") public void resetMaxFlashCount() { this.maxFlashCount = 3; } - @ObfuscatedName("an") + @ObfuscatedName("af") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-1674194456" + signature = "(IB)V", + garbageValue = "42" ) @Export("setCyclesPerFlash") public void setCyclesPerFlash(int var1) { @@ -1120,30 +1133,30 @@ public class WorldMap { } - @ObfuscatedName("al") + @ObfuscatedName("ap") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "29" + signature = "(I)V", + garbageValue = "1817253337" ) @Export("resetCyclesPerFlash") public void resetCyclesPerFlash() { this.cyclesPerFlash = 50; } - @ObfuscatedName("ay") + @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "-2012607233" + signature = "(ZB)V", + garbageValue = "50" ) @Export("setPerpetualFlash") public void setPerpetualFlash(boolean var1) { this.perpetualFlash = var1; } - @ObfuscatedName("ax") + @ObfuscatedName("am") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-1095491529" + garbageValue = "1830281477" ) @Export("flashElement") public void flashElement(int var1) { @@ -1153,10 +1166,10 @@ public class WorldMap { this.flashCycle = 0; } - @ObfuscatedName("au") + @ObfuscatedName("ab") @ObfuscatedSignature( signature = "(IB)V", - garbageValue = "118" + garbageValue = "0" ) @Export("flashCategory") public void flashCategory(int var1) { @@ -1164,38 +1177,38 @@ public class WorldMap { this.flashCount = 0; this.flashCycle = 0; - for (int var2 = 0; var2 < WorldMapElement.WorldMapElement_count; ++var2) { - if (Varcs.WorldMapElement_get(var2) != null && Varcs.WorldMapElement_get(var2).category == var1) { - this.flashingElements.add(Varcs.WorldMapElement_get(var2).objectId); + for (int var2 = 0; var2 < class180.WorldMapElement_count; ++var2) { + if (GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(var2) != null && GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(var2).category == var1) { + this.flashingElements.add(GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(var2).objectId); } } } - @ObfuscatedName("as") + @ObfuscatedName("bj") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-682947928" + signature = "(B)V", + garbageValue = "104" ) @Export("stopCurrentFlashes") public void stopCurrentFlashes() { this.flashingElements = null; } - @ObfuscatedName("ah") + @ObfuscatedName("bg") @ObfuscatedSignature( signature = "(ZI)V", - garbageValue = "810003234" + garbageValue = "315793353" ) @Export("setElementsDisabled") public void setElementsDisabled(boolean var1) { this.elementsDisabled = !var1; } - @ObfuscatedName("bi") + @ObfuscatedName("bw") @ObfuscatedSignature( signature = "(IZI)V", - garbageValue = "-2063721830" + garbageValue = "-1035576762" ) @Export("disableElement") public void disableElement(int var1, boolean var2) { @@ -1205,13 +1218,13 @@ public class WorldMap { this.enabledElements.remove(var1); } - this.method6428(); + this.method6409(); } - @ObfuscatedName("bo") + @ObfuscatedName("bk") @ObfuscatedSignature( signature = "(IZI)V", - garbageValue = "-2093321412" + garbageValue = "-900905988" ) @Export("setCategoryDisabled") public void setCategoryDisabled(int var1, boolean var2) { @@ -1221,9 +1234,9 @@ public class WorldMap { this.enabledCategories.remove(var1); } - for (int var3 = 0; var3 < WorldMapElement.WorldMapElement_count; ++var3) { - if (Varcs.WorldMapElement_get(var3) != null && Varcs.WorldMapElement_get(var3).category == var1) { - int var4 = Varcs.WorldMapElement_get(var3).objectId; + for (int var3 = 0; var3 < class180.WorldMapElement_count; ++var3) { + if (GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(var3) != null && GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(var3).category == var1) { + int var4 = GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(var3).objectId; if (!var2) { this.enabledElementIds.add(var4); } else { @@ -1232,61 +1245,61 @@ public class WorldMap { } } - this.method6428(); + this.method6409(); } - @ObfuscatedName("bx") + @ObfuscatedName("bl") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "-102" + signature = "(I)Z", + garbageValue = "-1450981799" ) @Export("getElementsDisabled") public boolean getElementsDisabled() { return !this.elementsDisabled; } - @ObfuscatedName("bu") + @ObfuscatedName("bq") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "-2079425256" + garbageValue = "-2012828359" ) @Export("isElementDisabled") public boolean isElementDisabled(int var1) { return !this.enabledElements.contains(var1); } - @ObfuscatedName("bd") + @ObfuscatedName("bx") @ObfuscatedSignature( - signature = "(IB)Z", - garbageValue = "35" + signature = "(II)Z", + garbageValue = "-521010176" ) @Export("isCategoryDisabled") public boolean isCategoryDisabled(int var1) { return !this.enabledCategories.contains(var1); } - @ObfuscatedName("bn") + @ObfuscatedName("bc") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "122" + signature = "(I)V", + garbageValue = "1601699261" ) - void method6428() { + void method6409() { this.field3989.clear(); this.field3989.addAll(this.enabledElements); this.field3989.addAll(this.enabledElementIds); } - @ObfuscatedName("bj") + @ObfuscatedName("by") @ObfuscatedSignature( signature = "(IIIIIII)V", - garbageValue = "-1575355810" + garbageValue = "-1315174671" ) @Export("addElementMenuOptions") public void addElementMenuOptions(int var1, int var2, int var3, int var4, int var5, int var6) { if (this.cacheLoader.isLoaded()) { int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); int var8 = (int)Math.ceil((double)((float)var4 / this.zoom)); - List var9 = this.worldMapManager.method645(this.centerTileX - var7 / 2 - 1, this.centerTileY - var8 / 2 - 1, var7 / 2 + this.centerTileX + 1, var8 / 2 + this.centerTileY + 1, var1, var2, var3, var4, var5, var6); + List var9 = this.worldMapManager.method647(this.centerTileX - var7 / 2 - 1, this.centerTileY - var8 / 2 - 1, var7 / 2 + this.centerTileX + 1, var8 / 2 + this.centerTileY + 1, var1, var2, var3, var4, var5, var6); if (!var9.isEmpty()) { Iterator var10 = var9.iterator(); @@ -1297,12 +1310,12 @@ public class WorldMap { } AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); - WorldMapElement var12 = Varcs.WorldMapElement_get(var11.getElement()); + WorldMapElement var12 = GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(var11.getElement()); var13 = false; for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { if (var12.menuActions[var14] != null) { - WorldMapSprite.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); + class1.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); var13 = true; } } @@ -1312,12 +1325,12 @@ public class WorldMap { } } - @ObfuscatedName("bm") + @ObfuscatedName("bz") @ObfuscatedSignature( - signature = "(ILhx;B)Lhx;", - garbageValue = "8" + signature = "(ILht;I)Lht;", + garbageValue = "1569536165" ) - public Coord method6430(int var1, Coord var2) { + public Coord method6416(int var1, Coord var2) { if (!this.cacheLoader.isLoaded()) { return null; } else if (!this.worldMapManager.isLoaded()) { @@ -1343,7 +1356,7 @@ public class WorldMap { var8 = (AbstractWorldMapIcon)var7.next(); int var9 = var8.coord2.x - var2.x; int var10 = var8.coord2.y - var2.y; - var11 = var9 * var9 + var10 * var10; + var11 = var10 * var10 + var9 * var9; if (var11 == 0) { return var8.coord2; } @@ -1358,10 +1371,10 @@ public class WorldMap { } } - @ObfuscatedName("bq") + @ObfuscatedName("bm") @ObfuscatedSignature( - signature = "(IILhx;Lhx;I)V", - garbageValue = "-891012179" + signature = "(IILht;Lht;I)V", + garbageValue = "-268236233" ) @Export("worldMapMenuAction") public void worldMapMenuAction(int var1, int var2, Coord var3, Coord var4) { @@ -1385,13 +1398,13 @@ public class WorldMap { var5.setType(14); } - WorldMapLabel.runScriptEvent(var5); + Client.runScriptEvent(var5); } - @ObfuscatedName("bf") + @ObfuscatedName("bo") @ObfuscatedSignature( - signature = "(I)Laa;", - garbageValue = "-2118416686" + signature = "(S)Lao;", + garbageValue = "-10343" ) @Export("iconStart") public AbstractWorldMapIcon iconStart() { @@ -1401,23 +1414,23 @@ public class WorldMap { return null; } else { HashMap var1 = this.worldMapManager.buildIcons(); - this.field3953 = new LinkedList(); + this.field3946 = new LinkedList(); Iterator var2 = var1.values().iterator(); while (var2.hasNext()) { List var3 = (List)var2.next(); - this.field3953.addAll(var3); + this.field3946.addAll(var3); } - this.iconIterator = this.field3953.iterator(); + this.iconIterator = this.field3946.iterator(); return this.iconNext(); } } - @ObfuscatedName("by") + @ObfuscatedName("bs") @ObfuscatedSignature( - signature = "(I)Laa;", - garbageValue = "1972262999" + signature = "(B)Lao;", + garbageValue = "88" ) @Export("iconNext") public AbstractWorldMapIcon iconNext() { diff --git a/runescape-client/src/main/java/WorldMapArchiveLoader.java b/runescape-client/src/main/java/WorldMapArchiveLoader.java index 93cea7096e..80b3161424 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("lr") +@ObfuscatedName("lm") @Implements("WorldMapArchiveLoader") public class WorldMapArchiveLoader { - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("cacheName") String cacheName; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "Lhf;" + signature = "Lhz;" ) @Export("archive") AbstractArchive archive; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1643456433 + intValue = -1143529111 ) @Export("percentLoaded") int percentLoaded; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("loaded") boolean loaded; @ObfuscatedSignature( - signature = "(Lhf;)V" + signature = "(Lhz;)V" ) WorldMapArchiveLoader(AbstractArchive var1) { this.percentLoaded = 0; @@ -35,10 +35,10 @@ public class WorldMapArchiveLoader { this.archive = var1; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", - garbageValue = "-102" + signature = "(Ljava/lang/String;I)V", + garbageValue = "-1366439933" ) @Export("reset") void reset(String var1) { @@ -52,15 +52,15 @@ public class WorldMapArchiveLoader { } } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "421887253" + signature = "(B)I", + garbageValue = "1" ) @Export("load") int load() { if (this.percentLoaded < 33) { - if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field303.name, this.cacheName)) { + if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field286.name, this.cacheName)) { return this.percentLoaded; } @@ -68,7 +68,7 @@ public class WorldMapArchiveLoader { } if (this.percentLoaded == 33) { - if (this.archive.isValidFileName(WorldMapCacheName.field307.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field307.name, this.cacheName)) { + if (this.archive.isValidFileName(WorldMapCacheName.field287.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field287.name, this.cacheName)) { return this.percentLoaded; } @@ -76,7 +76,7 @@ public class WorldMapArchiveLoader { } if (this.percentLoaded == 66) { - if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field306.name)) { + if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field289.name)) { return this.percentLoaded; } @@ -87,20 +87,20 @@ public class WorldMapArchiveLoader { return this.percentLoaded; } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-2116319250" + garbageValue = "146861594" ) @Export("isLoaded") boolean isLoaded() { return this.loaded; } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-54" + signature = "(I)I", + garbageValue = "1697040105" ) @Export("getPercentLoaded") int getPercentLoaded() { diff --git a/runescape-client/src/main/java/WorldMapArea.java b/runescape-client/src/main/java/WorldMapArea.java index 6166d785b8..0e6ed61218 100644 --- a/runescape-client/src/main/java/WorldMapArea.java +++ b/runescape-client/src/main/java/WorldMapArea.java @@ -1,5 +1,3 @@ -import java.io.IOException; -import java.util.Date; import java.util.Iterator; import java.util.LinkedList; import net.runelite.mapping.Export; @@ -7,69 +5,68 @@ 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("af") +@ObfuscatedName("aa") @Implements("WorldMapArea") public class WorldMapArea { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 122238223 + intValue = -403509389 ) @Export("id") int id; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("internalName") String internalName; - @ObfuscatedName("b") + @ObfuscatedName("y") @Export("externalName") String externalName; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1540917345 + intValue = 857333611 ) @Export("backGroundColor") int backGroundColor; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 959137413 + intValue = -345776741 ) @Export("zoom") int zoom; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "Lhx;" + signature = "Lht;" ) @Export("origin") Coord origin; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1713545369 + intValue = 1441436013 ) @Export("regionLowX") int regionLowX; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1689268055 + intValue = -685952677 ) @Export("regionHighX") int regionHighX; - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1354478225 + intValue = 143703109 ) @Export("regionLowY") int regionLowY; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1917825101 + intValue = 1106684175 ) @Export("regionHighY") int regionHighY; - @ObfuscatedName("k") + @ObfuscatedName("c") @Export("isMain") boolean isMain; - @ObfuscatedName("x") + @ObfuscatedName("o") @Export("sections") LinkedList sections; @@ -85,10 +82,10 @@ public class WorldMapArea { this.isMain = false; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Lkg;IS)V", - garbageValue = "255" + signature = "(Lkq;II)V", + garbageValue = "-1882227443" ) @Export("read") public void read(Buffer var1, int var2) { @@ -110,28 +107,28 @@ public class WorldMapArea { this.setBounds(); } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkg;I)Lav;", - garbageValue = "-1936635513" + signature = "(Lkq;I)Laz;", + garbageValue = "383916658" ) @Export("readWorldMapSection") WorldMapSection readWorldMapSection(Buffer var1) { int var2 = var1.readUnsignedByte(); - WorldMapSectionType var3 = (WorldMapSectionType)CollisionMap.findEnumerated(WorldMapSectionType.method262(), var2); + WorldMapSectionType var3 = (WorldMapSectionType)DynamicObject.findEnumerated(WorldMapSectionType.method235(), var2); Object var4 = null; switch(var3.type) { case 0: - var4 = new WorldMapSection2(); + var4 = new WorldMapSection1(); break; case 1: var4 = new WorldMapSection0(); break; case 2: - var4 = new WorldMapSection1(); + var4 = new class42(); break; case 3: - var4 = new class42(); + var4 = new WorldMapSection2(); break; default: throw new IllegalStateException(""); @@ -141,10 +138,10 @@ public class WorldMapArea { return (WorldMapSection)var4; } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "(IIII)Z", - garbageValue = "-2105358172" + garbageValue = "-1895835322" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { @@ -162,10 +159,10 @@ public class WorldMapArea { return true; } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(IIS)Z", - garbageValue = "2206" + signature = "(III)Z", + garbageValue = "1579456955" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { @@ -193,10 +190,10 @@ public class WorldMapArea { } } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(IIII)[I", - garbageValue = "-984592033" + garbageValue = "-722762456" ) @Export("position") public int[] position(int var1, int var2, int var3) { @@ -214,10 +211,10 @@ public class WorldMapArea { return var5.getBorderTileLengths(var1, var2, var3); } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(IIB)Lhx;", - garbageValue = "66" + signature = "(IIB)Lht;", + garbageValue = "78" ) @Export("coord") public Coord coord(int var1, int var2) { @@ -235,10 +232,10 @@ public class WorldMapArea { return var4.coord(var1, var2); } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "2134226031" + garbageValue = "-6387744" ) @Export("setBounds") void setBounds() { @@ -251,536 +248,265 @@ public class WorldMapArea { } - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-558298236" + garbageValue = "-1737975976" ) @Export("getId") public int getId() { return this.id; } - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-1980333643" + signature = "(S)Z", + garbageValue = "128" ) @Export("getIsMain") public boolean getIsMain() { return this.isMain; } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I)Ljava/lang/String;", - garbageValue = "986616320" + signature = "(B)Ljava/lang/String;", + garbageValue = "1" ) @Export("getInternalName") public String getInternalName() { return this.internalName; } - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(I)Ljava/lang/String;", - garbageValue = "2135576042" + garbageValue = "1973605030" ) @Export("getExternalName") public String getExternalName() { return this.externalName; } - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(S)I", - garbageValue = "14931" + signature = "(B)I", + garbageValue = "14" ) @Export("getBackGroundColor") int getBackGroundColor() { return this.backGroundColor; } - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-2065427390" + garbageValue = "597434028" ) @Export("getZoom") public int getZoom() { return this.zoom; } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-253398901" + garbageValue = "-1252580439" ) @Export("getRegionLowX") public int getRegionLowX() { return this.regionLowX; } - @ObfuscatedName("n") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1831938917" + garbageValue = "-1887142799" ) @Export("getRegionHighX") public int getRegionHighX() { return this.regionHighX; } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-847812540" + garbageValue = "-56288601" ) @Export("getRegionLowY") public int getRegionLowY() { return this.regionLowY; } - @ObfuscatedName("s") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-10" + signature = "(I)I", + garbageValue = "1216154135" ) @Export("getRegionHighY") public int getRegionHighY() { return this.regionHighY; } - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "25027619" + garbageValue = "-1826469414" ) @Export("getOriginX") public int getOriginX() { return this.origin.x; } - @ObfuscatedName("m") + @ObfuscatedName("h") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "234586297" + garbageValue = "-1153099258" ) @Export("getOriginPlane") public int getOriginPlane() { return this.origin.plane; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-554027606" + garbageValue = "907548196" ) @Export("getOriginY") public int getOriginY() { return this.origin.y; } - @ObfuscatedName("q") + @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "(I)Lhx;", - garbageValue = "1357419323" + signature = "(I)Lht;", + garbageValue = "1045101809" ) @Export("getOrigin") public Coord getOrigin() { return new Coord(this.origin); } - @ObfuscatedName("b") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(I)Lbs;", - garbageValue = "-1284252548" + signature = "(IIII)Lls;", + garbageValue = "905152692" ) - static ClientPreferences method422() { - AccessFile var0 = null; - ClientPreferences var1 = new ClientPreferences(); - - try { - var0 = class191.getPreferencesFile("", UserComparator8.field1973.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(); - } - } - - var1 = new ClientPreferences(new Buffer(var2)); - } catch (Exception var6) { - } - - try { - if (var0 != null) { - var0.close(); - } - } catch (Exception var5) { - } - - return var1; + static Sprite method381(int var0, int var1, int var2) { + DemotingHashTable var3 = WorldMapRegion.WorldMapRegion_cachedSprites; + long var4 = (long)(var2 << 16 | var0 << 8 | var1); + return (Sprite)var3.get(var4); } - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "([BI)Lci;", - garbageValue = "-1522510902" + signature = "(IB)Liy;", + garbageValue = "80" ) - @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(); - IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? WorldMapID.method566(var8) : 1); - var1.switches[var7] = var9; - - while (var8-- > 0) { - int var10 = var2.readInt(); - int var11 = var2.readInt(); - var9.put(new IntegerNode(var11), (long)var10); - } - } - } - - 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; - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - signature = "(ILci;ZI)I", - garbageValue = "-1045531754" - ) - static int method396(int var0, Script var1, boolean var2) { - String var3; - int var4; - if (var0 == ScriptOpcodes.APPEND_NUM) { - var3 = Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var3 + var4; - return 1; + public static FloorUnderlayDefinition method405(int var0) { + FloorUnderlayDefinition var1 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; } else { - String var9; - if (var0 == ScriptOpcodes.APPEND) { - class43.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[class43.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[class43.Interpreter_stringStackSize + 1]; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var3 + var9; - return 1; - } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { - var3 = Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var3 + VarbitDefinition.intToString(var4, true); - return 1; - } else if (var0 == ScriptOpcodes.LOWERCASE) { - var3 = Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var3.toLowerCase(); - return 1; - } else { - int var6; - int var10; - if (var0 == ScriptOpcodes.FROMDATE) { - var10 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - long var11 = 86400000L * ((long)var10 + 11745L); - Interpreter.Interpreter_calendar.setTime(new Date(var11)); - var6 = Interpreter.Interpreter_calendar.get(5); - int var16 = Interpreter.Interpreter_calendar.get(2); - int var8 = Interpreter.Interpreter_calendar.get(1); - Interpreter.Interpreter_stringStack[++class43.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[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = Integer.toString(var10); - return 1; - } else if (var0 == ScriptOpcodes.COMPARE) { - class43.Interpreter_stringStackSize -= 2; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Friend.method5293(ArchiveDiskActionHandler.compareStrings(Interpreter.Interpreter_stringStack[class43.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[class43.Interpreter_stringStackSize + 1], VarbitDefinition.clientLanguage)); - return 1; - } else { - int var5; - byte[] var13; - Font var14; - if (var0 == ScriptOpcodes.PARAHEIGHT) { - var3 = Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]; - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - var13 = class269.archive13.takeFile(var5, 0); - var14 = new Font(var13); - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var14.lineCount(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.PARAWIDTH) { - var3 = Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]; - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - var13 = class269.archive13.takeFile(var5, 0); - var14 = new Font(var13); - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var14.lineWidth(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { - class43.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[class43.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[class43.Interpreter_stringStackSize + 1]; - if (Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1) { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var3; - } else { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var9; - } - - return 1; - } else if (var0 == ScriptOpcodes.ESCAPE) { - var3 = Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); - return 1; - } else if (var0 == ScriptOpcodes.APPEND_CHAR) { - var3 = Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var3 + (char)var4; - return 1; - } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { - var10 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = FloorDecoration.isCharPrintable((char)var10) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { - var10 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Varcs.isAlphaNumeric((char)var10) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { - var10 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = SequenceDefinition.isCharAlphabetic((char)var10) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { - var10 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = AbstractWorldMapData.isDigit((char)var10) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.STRING_LENGTH) { - var3 = Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]; - if (var3 != null) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.length(); - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.SUBSTRING) { - var3 = Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]; - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var3.substring(var4, var5); - return 1; - } else if (var0 == ScriptOpcodes.REMOVETAGS) { - var3 = Interpreter.Interpreter_stringStack[--class43.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[++class43.Interpreter_stringStackSize - 1] = var17.toString(); - return 1; - } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { - var3 = Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.indexOf(var4); - return 1; - } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { - class43.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[class43.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[class43.Interpreter_stringStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.indexOf(var9, var5); - return 1; - } else if (var0 == ScriptOpcodes.UPPERCASE) { - var3 = Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var3.toUpperCase(); - return 1; - } else { - return 2; - } - } - } else { - class43.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[class43.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[class43.Interpreter_stringStackSize + 1]; - if (class215.localPlayer.appearance != null && class215.localPlayer.appearance.isFemale) { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var9; - } else { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var3; - } - - return 1; - } + byte[] var2 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var0); + var1 = new FloorUnderlayDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2), var0); } + + var1.postDecode(); + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0); + return var1; } } - @ObfuscatedName("ht") + @ObfuscatedName("il") + @ObfuscatedSignature( + signature = "(ILjava/lang/String;I)V", + garbageValue = "-2069103908" + ) + static void method364(int var0, String var1) { + int var2 = Players.Players_count; + int[] var3 = Players.Players_indices; + boolean var4 = false; + Username var5 = new Username(var1, class188.loginType); + + for (int var6 = 0; var6 < var2; ++var6) { + Player var7 = Client.players[var3[var6]]; + if (var7 != null && var7 != Message.localPlayer && var7.username != null && var7.username.equals(var5)) { + PacketBufferNode var8; + if (var0 == 1) { + var8 = class2.getPacketBufferNode(ClientPacket.field2222, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5746(var3[var6]); + var8.packetBuffer.method5569(0); + Client.packetWriter.addNode(var8); + } else if (var0 == 4) { + var8 = class2.getPacketBufferNode(ClientPacket.field2273, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5696(0); + var8.packetBuffer.writeIntME(var3[var6]); + Client.packetWriter.addNode(var8); + } else if (var0 == 6) { + var8 = class2.getPacketBufferNode(ClientPacket.field2214, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5720(0); + var8.packetBuffer.method5579(var3[var6]); + Client.packetWriter.addNode(var8); + } else if (var0 == 7) { + var8 = class2.getPacketBufferNode(ClientPacket.field2235, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5720(0); + var8.packetBuffer.method5746(var3[var6]); + Client.packetWriter.addNode(var8); + } + + var4 = true; + break; + } + } + + if (!var4) { + class83.addGameMessage(4, "", "Unable to find " + var1); + } + + } + + @ObfuscatedName("iq") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-2037516367" + garbageValue = "1140940631" ) - static final void method424() { - 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.field764[++Client.field814 - 1] = Client.npcIndices[var2]; - } - } + static final void method404() { + boolean var0 = false; - if (var1 > Client.npcCount) { - throw new RuntimeException(""); - } else { - Client.npcCount = 0; + while (!var0) { + var0 = true; - 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.field688[++Client.field687 - 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.method2058(var7, (byte)1); - var8 = var0.readBits(1); - if (var8 == 1) { - Client.field688[++Client.field687 - 1] = var3; - } - } else if (var6 == 2) { - Client.npcIndices[++Client.npcCount - 1] = var3; - var4.npcCycle = Client.cycle; - var7 = var0.readBits(3); - var4.method2058(var7, (byte)2); - var8 = var0.readBits(3); - var4.method2058(var8, (byte)2); - int var9 = var0.readBits(1); - if (var9 == 1) { - Client.field688[++Client.field687 - 1] = var3; - } - } else if (var6 == 3) { - Client.field764[++Client.field814 - 1] = var3; - } - } + for (int var1 = 0; var1 < Client.menuOptionsCount - 1; ++var1) { + if (Client.menuOpcodes[var1] < 1000 && Client.menuOpcodes[var1 + 1] > 1000) { + String var2 = Client.menuTargets[var1]; + Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; + Client.menuTargets[var1 + 1] = var2; + String var3 = Client.menuActions[var1]; + Client.menuActions[var1] = Client.menuActions[var1 + 1]; + Client.menuActions[var1 + 1] = var3; + int var4 = Client.menuOpcodes[var1]; + Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; + Client.menuOpcodes[var1 + 1] = var4; + var4 = Client.menuArguments1[var1]; + Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; + Client.menuArguments1[var1 + 1] = var4; + var4 = Client.menuArguments2[var1]; + Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; + Client.menuArguments2[var1 + 1] = var4; + var4 = Client.menuIdentifiers[var1]; + Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; + Client.menuIdentifiers[var1 + 1] = var4; + boolean var5 = Client.menuShiftClick[var1]; + Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; + Client.menuShiftClick[var1 + 1] = var5; + var0 = false; } } - } - } - @ObfuscatedName("jj") - @ObfuscatedSignature( - signature = "(Lhl;I)Z", - garbageValue = "985912778" - ) - @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 = Language.method3719(var0, var1); - int var3 = var0.cs1ComparisonValues[var1]; - if (var0.cs1Comparisons[var1] == 2) { - if (var2 >= var3) { - return false; - } - } else if (var0.cs1Comparisons[var1] == 3) { - if (var2 <= var3) { - return false; - } - } else if (var0.cs1Comparisons[var1] == 4) { - if (var3 == var2) { - return false; - } - } else if (var3 != var2) { - return false; - } - } - - return true; - } - } - - @ObfuscatedName("jv") - @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "116" - ) - @Export("Widget_resetModelFrames") - static final void Widget_resetModelFrames(int var0) { - if (UserComparator3.loadInterface(var0)) { - Widget[] var1 = FloorDecoration.Widget_interfaceComponents[var0]; - - for (int var2 = 0; var2 < var1.length; ++var2) { - Widget var3 = var1[var2]; - if (var3 != null) { - var3.modelFrame = 0; - var3.modelFrameCycle = 0; - } - } - - } } } diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index 5252efece8..ea8c65c2c9 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -3,36 +3,30 @@ import java.util.LinkedList; import java.util.List; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("aq") +@ObfuscatedName("ay") @Implements("WorldMapAreaData") public class WorldMapAreaData extends WorldMapArea { - @ObfuscatedName("lv") - @ObfuscatedGetter( - intValue = 147472747 - ) - @Export("selectedSpellWidget") - static int selectedSpellWidget; - @ObfuscatedName("o") + @ObfuscatedName("v") @Export("worldMapData0Set") HashSet worldMapData0Set; - @ObfuscatedName("e") + @ObfuscatedName("k") @Export("worldMapData1Set") HashSet worldMapData1Set; - @ObfuscatedName("n") + @ObfuscatedName("s") @Export("iconList") List iconList; WorldMapAreaData() { } - @ObfuscatedName("be") + @ObfuscatedName("cd") @ObfuscatedSignature( - signature = "(Lkg;Lkg;IZI)V", - garbageValue = "-2087275167" + signature = "(Lkq;Lkq;IZI)V", + garbageValue = "-466538568" ) @Export("init") void init(Buffer var1, Buffer var2, int var3, boolean var4) { @@ -71,10 +65,10 @@ public class WorldMapAreaData extends WorldMapArea { this.initIconsList(var2, var4); } - @ObfuscatedName("bt") + @ObfuscatedName("cj") @ObfuscatedSignature( - signature = "(Lkg;ZI)V", - garbageValue = "83812464" + signature = "(Lkq;ZB)V", + garbageValue = "119" ) @Export("initIconsList") void initIconsList(Buffer var1, boolean var2) { @@ -82,7 +76,7 @@ public class WorldMapAreaData extends WorldMapArea { int var3 = var1.readUnsignedShort(); for (int var4 = 0; var4 < var3; ++var4) { - int var5 = var1.method5618(); + int var5 = var1.method5560(); Coord var6 = new Coord(var1.readInt()); boolean var7 = var1.readUnsignedByte() == 1; if (var2 || !var7) { @@ -92,100 +86,849 @@ public class WorldMapAreaData extends WorldMapArea { } - @ObfuscatedName("u") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(I)[Lhe;", - garbageValue = "-2010559080" + signature = "(Ljava/lang/Throwable;Ljava/lang/String;)Lmg;" ) - public static StudioGame[] method709() { - return new StudioGame[]{StudioGame.runescape, StudioGame.game3, StudioGame.oldscape, StudioGame.game4, StudioGame.game5, StudioGame.stellardawn}; - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;ZZI)V", - garbageValue = "-1808835985" - ) - @Export("openURL") - public static void openURL(String var0, boolean var1, boolean var2) { - class191.method3721(var0, var1, "openjs", var2); - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "-67" - ) - @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("o") - @ObfuscatedSignature( - signature = "(II)Ljava/lang/String;", - garbageValue = "-316979952" - ) - static final String method711(int var0) { - if (var0 < 100000) { - return "" + var0 + ""; + @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 { - return var0 < 10000000 ? "" + var0 / 1000 + "K" + "" : "" + var0 / 1000000 + "M" + ""; + var2 = new RunException(var0, var1); + } + + return var2; + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "(Lkl;II)V", + garbageValue = "-1537977309" + ) + @Export("readPlayerUpdate") + static void readPlayerUpdate(PacketBuffer var0, int var1) { + boolean var2 = var0.readBits(1) == 1; + if (var2) { + Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; + } + + int var3 = var0.readBits(2); + Player var4 = Client.players[var1]; + if (var3 == 0) { + if (var2) { + var4.field616 = false; + } else if (Client.localPlayerIndex == var1) { + throw new RuntimeException(); + } else { + Players.Players_regions[var1] = (var4.plane << 28) + (ScriptEvent.baseY * 64 + var4.pathY[0] >> 13) + (MusicPatchPcmStream.baseX * 64 + var4.pathX[0] >> 13 << 14); + if (var4.field960 != -1) { + Players.Players_orientations[var1] = var4.field960; + } else { + Players.Players_orientations[var1] = var4.orientation; + } + + Players.Players_targetIndices[var1] = var4.targetIndex; + Client.players[var1] = null; + if (var0.readBits(1) != 0) { + WorldMapDecorationType.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.field616 = true; + var4.tileX = var6; + var4.tileY = var7; + } else { + var4.field616 = false; + var4.method1261(var6, var7, Players.field1231[var1]); + } + } else { + var4.resetPath(var6, var7); + var4.field616 = false; + } + + } else if (var3 == 2) { + var5 = var0.readBits(4); + var6 = var4.pathX[0]; + var7 = var4.pathY[0]; + if (var5 == 0) { + var6 -= 2; + var7 -= 2; + } else if (var5 == 1) { + --var6; + var7 -= 2; + } else if (var5 == 2) { + var7 -= 2; + } else if (var5 == 3) { + ++var6; + var7 -= 2; + } else if (var5 == 4) { + var6 += 2; + var7 -= 2; + } else if (var5 == 5) { + var6 -= 2; + --var7; + } else if (var5 == 6) { + var6 += 2; + --var7; + } else if (var5 == 7) { + var6 -= 2; + } else if (var5 == 8) { + var6 += 2; + } else if (var5 == 9) { + var6 -= 2; + ++var7; + } else if (var5 == 10) { + var6 += 2; + ++var7; + } else if (var5 == 11) { + var6 -= 2; + var7 += 2; + } else if (var5 == 12) { + --var6; + var7 += 2; + } else if (var5 == 13) { + var7 += 2; + } else if (var5 == 14) { + ++var6; + var7 += 2; + } else if (var5 == 15) { + var6 += 2; + var7 += 2; + } + + if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { + if (var2) { + var4.field616 = true; + var4.tileX = var6; + var4.tileY = var7; + } else { + var4.field616 = false; + var4.method1261(var6, var7, Players.field1231[var1]); + } + } else { + var4.resetPath(var6, var7); + var4.field616 = false; + } + + } else { + var5 = var0.readBits(1); + int var8; + int var9; + int var10; + int var11; + if (var5 == 0) { + var6 = var0.readBits(12); + var7 = var6 >> 10; + var8 = var6 >> 5 & 31; + if (var8 > 15) { + var8 -= 32; + } + + var9 = var6 & 31; + if (var9 > 15) { + var9 -= 32; + } + + var10 = var8 + var4.pathX[0]; + var11 = var9 + var4.pathY[0]; + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { + var4.resetPath(var10, var11); + var4.field616 = false; + } else if (var2) { + var4.field616 = true; + var4.tileX = var10; + var4.tileY = var11; + } else { + var4.field616 = false; + var4.method1261(var10, var11, Players.field1231[var1]); + } + + var4.plane = (byte)(var7 + var4.plane & 3); + if (Client.localPlayerIndex == var1) { + UrlRequest.Client_plane = var4.plane; + } + + } else { + var6 = var0.readBits(30); + var7 = var6 >> 28; + var8 = var6 >> 14 & 16383; + var9 = var6 & 16383; + var10 = (MusicPatchPcmStream.baseX * 64 + var8 + var4.pathX[0] & 16383) - MusicPatchPcmStream.baseX * 64; + var11 = (ScriptEvent.baseY * 64 + var9 + var4.pathY[0] & 16383) - ScriptEvent.baseY * 64; + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { + var4.resetPath(var10, var11); + var4.field616 = false; + } else if (var2) { + var4.field616 = true; + var4.tileX = var10; + var4.tileY = var11; + } else { + var4.field616 = false; + var4.method1261(var10, var11, Players.field1231[var1]); + } + + var4.plane = (byte)(var7 + var4.plane & 3); + if (Client.localPlayerIndex == var1) { + UrlRequest.Client_plane = var4.plane; + } + + } + } } } - @ObfuscatedName("q") + @ObfuscatedName("h") + @ObfuscatedSignature( + signature = "(ILcu;ZI)I", + garbageValue = "-1199061483" + ) + static int method692(int var0, Script var1, boolean var2) { + Widget var3 = Tile.getWidget(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); + if (var0 == ScriptOpcodes.IF_GETSCROLLX) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.scrollX; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.scrollY; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETTEXT) { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3.text; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.scrollWidth; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.scrollHeight; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.modelZoom; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.modelAngleX; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.modelAngleZ; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.modelAngleY; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETTRANSTOP) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.transparencyTop; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETTRANSBOT) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.transparencyBot; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.color; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.color2; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETFILLMODE) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; + return 1; + } else { + return 2; + } + } + + @ObfuscatedName("gr") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1095185077" + garbageValue = "-2018851224" ) - public static void method703() { - ItemDefinition.ItemDefinition_cached.clear(); - ItemDefinition.ItemDefinition_cachedModels.clear(); - ItemDefinition.ItemDefinition_cachedSprites.clear(); - } - - @ObfuscatedName("fw") - @ObfuscatedSignature( - signature = "(Lbt;I)V", - garbageValue = "-2077720731" - ) - static final void method707(Actor var0) { - if (var0.field982 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > GrandExchangeOfferAgeComparator.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { - int var1 = var0.field982 - var0.field934; - int var2 = Client.cycle - var0.field934; - int var3 = var0.field946 * 128 + var0.field938 * 64; - int var4 = var0.field979 * 128 + var0.field938 * 64; - int var5 = var0.field978 * 128 + var0.field938 * 64; - int var6 = var0.field980 * 128 + var0.field938 * 64; - var0.x = (var5 * var2 + var3 * (var1 - var2)) / var1; - var0.y = (var6 * var2 + var4 * (var1 - var2)) / var1; + static void method686() { + if (Client.renderSelf) { + class14.addPlayerToScene(Message.localPlayer, false); } - var0.field976 = 0; - var0.orientation = var0.field983; - var0.rotation = var0.orientation; } - @ObfuscatedName("kk") + @ObfuscatedName("jt") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "74366885" + signature = "([Lha;IIIIIIIB)V", + garbageValue = "71" ) - @Export("Clan_joinChat") - static final void Clan_joinChat(String var0) { - if (!var0.equals("")) { - PacketBufferNode var1 = ModelData0.getPacketBufferNode(ClientPacket.field2314, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(class173.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); + @Export("updateInterface") + static final void updateInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + for (int var8 = 0; var8 < var0.length; ++var8) { + Widget var9 = var0[var8]; + if (var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || WorldMapSection0.getWidgetClickMask(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { + if (var9.isIf3) { + if (Varcs.isComponentHidden(var9)) { + continue; + } + } else if (var9.type == 0 && var9 != class16.mousedOverWidgetIf1 && Varcs.isComponentHidden(var9)) { + continue; + } + + int var10 = var9.x + var6; + int var11 = var7 + var9.y; + int var12; + int var13; + int var14; + int var15; + int var17; + int var18; + if (var9.type == 2) { + var12 = var2; + var13 = var3; + var14 = var4; + var15 = var5; + } else { + int var16; + if (var9.type == 9) { + var16 = var10; + var17 = var11; + var18 = var10 + var9.width; + int var19 = var11 + var9.height; + if (var18 < var10) { + var16 = var18; + var18 = var10; + } + + if (var19 < var11) { + var17 = var19; + var19 = var11; + } + + ++var18; + ++var19; + var12 = var16 > var2 ? var16 : var2; + var13 = var17 > var3 ? var17 : var3; + var14 = var18 < var4 ? var18 : var4; + var15 = var19 < var5 ? var19 : var5; + } else { + var16 = var10 + var9.width; + var17 = var11 + var9.height; + var12 = var10 > var2 ? var10 : var2; + var13 = var11 > var3 ? var11 : var3; + var14 = var16 < var4 ? var16 : var4; + var15 = var17 < var5 ? var17 : var5; + } + } + + if (var9 == Client.clickedWidget) { + Client.field809 = true; + Client.field882 = var10; + Client.field811 = var11; + } + + boolean var32 = false; + if (var9.field2625) { + switch(Client.field790) { + case 0: + var32 = true; + case 1: + default: + break; + case 2: + if (Client.field791 == var9.id >>> 16) { + var32 = true; + } + break; + case 3: + if (var9.id == Client.field791) { + var32 = true; + } + } + } + + if (var32 || !var9.isIf3 || var12 < var14 && var13 < var15) { + if (var9.isIf3) { + ScriptEvent var26; + if (var9.noClickThrough) { + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { + if (var26.isMouseInputEvent) { + var26.remove(); + var26.widget.containsMouse = false; + } + } + + if (WorldMapSection2.widgetDragDuration == 0) { + Client.clickedWidget = null; + Client.clickedWidgetParent = null; + } + + if (!Client.isMenuOpen) { + Actor.addCancelMenuEntry(); + } + } + } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { + if (var26.isMouseInputEvent && var26.widget.onScroll == var26.args) { + var26.remove(); + } + } + } + } + + var17 = MouseHandler.MouseHandler_x; + var18 = MouseHandler.MouseHandler_y; + if (MouseHandler.MouseHandler_lastButton != 0) { + var17 = MouseHandler.MouseHandler_lastPressedX; + var18 = MouseHandler.MouseHandler_lastPressedY; + } + + boolean var33 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; + if (var9.contentType == 1337) { + if (!Client.isLoading && !Client.isMenuOpen && var33) { + Huffman.addSceneMenuOptions(var17, var18, var12, var13); + } + } else if (var9.contentType == 1338) { + AbstractUserComparator.checkIfMinimapClicked(var9, var10, var11); + } else { + if (var9.contentType == 1400) { + GrandExchangeEvent.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var33, var10, var11, var9.width, var9.height); + } + + if (!Client.isMenuOpen && var33) { + if (var9.contentType == 1400) { + GrandExchangeEvent.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18); + } else { + AbstractWorldMapData.method263(var9, var17 - var10, var18 - var11); + } + } + + boolean var21; + int var23; + if (var32) { + for (int var20 = 0; var20 < var9.field2626.length; ++var20) { + var21 = false; + boolean var22 = false; + if (!var21 && var9.field2626[var20] != null) { + for (var23 = 0; var23 < var9.field2626[var20].length; ++var23) { + boolean var24 = false; + if (var9.field2655 != null) { + var24 = KeyHandler.KeyHandler_pressedKeys[var9.field2626[var20][var23]]; + } + + if (ScriptEvent.method1185(var9.field2626[var20][var23]) || var24) { + var21 = true; + if (var9.field2655 != null && var9.field2655[var20] > Client.cycle) { + break; + } + + byte var25 = var9.field2629[var20][var23]; + if (var25 == 0 || ((var25 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var25 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var25 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var25 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) { + var22 = true; + break; + } + } + } + } + + if (var22) { + if (var20 < 10) { + KeyHandler.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); + } else if (var20 == 10) { + GrandExchangeOfferUnitPriceComparator.Widget_runOnTargetLeave(); + WorldMapData_0.selectSpell(var9.id, var9.childIndex, class14.method157(WorldMapSection0.getWidgetClickMask(var9)), var9.itemId); + Client.selectedSpellActionName = class60.method1167(var9); + if (Client.selectedSpellActionName == null) { + Client.selectedSpellActionName = "null"; + } + + Client.selectedSpellName = var9.dataText + NPC.colorStartTag(16777215); + } + + var23 = var9.field2631[var20]; + if (var9.field2655 == null) { + var9.field2655 = new int[var9.field2626.length]; + } + + if (var9.field2670 == null) { + var9.field2670 = new int[var9.field2626.length]; + } + + if (var23 != 0) { + if (var9.field2655[var20] == 0) { + var9.field2655[var20] = var23 + Client.cycle + var9.field2670[var20]; + } else { + var9.field2655[var20] = var23 + Client.cycle; + } + } else { + var9.field2655[var20] = Integer.MAX_VALUE; + } + } + + if (!var21 && var9.field2655 != null) { + var9.field2655[var20] = 0; + } + } + } + + if (var9.isIf3) { + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + var33 = true; + } else { + var33 = false; + } + + boolean var34 = false; + if ((MouseHandler.MouseHandler_currentButton == 1 || !NetFileRequest.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var33) { + var34 = true; + } + + var21 = false; + if ((MouseHandler.MouseHandler_lastButton == 1 || !NetFileRequest.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { + var21 = true; + } + + if (var21) { + GrandExchangeOfferNameComparator.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11); + } + + if (var9.contentType == 1400) { + GrandExchangeEvent.worldMap.method6359(var17, var18, var33 & var34, var33 & var21); + } + + if (Client.clickedWidget != null && var9 != Client.clickedWidget && var33 && Player.method1278(WorldMapSection0.getWidgetClickMask(var9))) { + Client.draggedOnWidget = var9; + } + + if (var9 == Client.clickedWidgetParent) { + Client.field806 = true; + Client.field807 = var10; + Client.field808 = var11; + } + + if (var9.hasListener) { + ScriptEvent var27; + if (var33 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { + var27 = new ScriptEvent(); + var27.isMouseInputEvent = true; + var27.widget = var9; + var27.mouseY = Client.mouseWheelRotation; + var27.args = var9.onScroll; + Client.scriptEvents.addFirst(var27); + } + + if (Client.clickedWidget != null || ClientPreferences.dragInventoryWidget != null || Client.isMenuOpen) { + var21 = false; + var34 = false; + var33 = false; + } + + if (!var9.isClicked && var21) { + var9.isClicked = true; + if (var9.onClick != null) { + var27 = new ScriptEvent(); + var27.isMouseInputEvent = true; + var27.widget = var9; + var27.mouseX = MouseHandler.MouseHandler_lastPressedX - var10; + var27.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; + var27.args = var9.onClick; + Client.scriptEvents.addFirst(var27); + } + } + + if (var9.isClicked && var34 && var9.onClickRepeat != null) { + var27 = new ScriptEvent(); + var27.isMouseInputEvent = true; + var27.widget = var9; + var27.mouseX = MouseHandler.MouseHandler_x - var10; + var27.mouseY = MouseHandler.MouseHandler_y - var11; + var27.args = var9.onClickRepeat; + Client.scriptEvents.addFirst(var27); + } + + if (var9.isClicked && !var34) { + var9.isClicked = false; + if (var9.onRelease != null) { + var27 = new ScriptEvent(); + var27.isMouseInputEvent = true; + var27.widget = var9; + var27.mouseX = MouseHandler.MouseHandler_x - var10; + var27.mouseY = MouseHandler.MouseHandler_y - var11; + var27.args = var9.onRelease; + Client.field883.addFirst(var27); + } + } + + if (var34 && var9.onHold != null) { + var27 = new ScriptEvent(); + var27.isMouseInputEvent = true; + var27.widget = var9; + var27.mouseX = MouseHandler.MouseHandler_x - var10; + var27.mouseY = MouseHandler.MouseHandler_y - var11; + var27.args = var9.onHold; + Client.scriptEvents.addFirst(var27); + } + + if (!var9.containsMouse && var33) { + var9.containsMouse = true; + if (var9.onMouseOver != null) { + var27 = new ScriptEvent(); + var27.isMouseInputEvent = true; + var27.widget = var9; + var27.mouseX = MouseHandler.MouseHandler_x - var10; + var27.mouseY = MouseHandler.MouseHandler_y - var11; + var27.args = var9.onMouseOver; + Client.scriptEvents.addFirst(var27); + } + } + + if (var9.containsMouse && var33 && var9.onMouseRepeat != null) { + var27 = new ScriptEvent(); + var27.isMouseInputEvent = true; + var27.widget = var9; + var27.mouseX = MouseHandler.MouseHandler_x - var10; + var27.mouseY = MouseHandler.MouseHandler_y - var11; + var27.args = var9.onMouseRepeat; + Client.scriptEvents.addFirst(var27); + } + + if (var9.containsMouse && !var33) { + var9.containsMouse = false; + if (var9.onMouseLeave != null) { + var27 = new ScriptEvent(); + var27.isMouseInputEvent = true; + var27.widget = var9; + var27.mouseX = MouseHandler.MouseHandler_x - var10; + var27.mouseY = MouseHandler.MouseHandler_y - var11; + var27.args = var9.onMouseLeave; + Client.field883.addFirst(var27); + } + } + + if (var9.onTimer != null) { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.onTimer; + Client.field865.addFirst(var27); + } + + ScriptEvent var30; + int var35; + int var36; + if (var9.onVarTransmit != null && Client.field648 > var9.field2685) { + if (var9.varTransmitTriggers != null && Client.field648 - var9.field2685 <= 32) { + label883: + for (var35 = var9.field2685; var35 < Client.field648; ++var35) { + var23 = Client.field814[var35 & 31]; + + for (var36 = 0; var36 < var9.varTransmitTriggers.length; ++var36) { + if (var23 == var9.varTransmitTriggers[var36]) { + var30 = new ScriptEvent(); + var30.widget = var9; + var30.args = var9.onVarTransmit; + Client.scriptEvents.addFirst(var30); + break label883; + } + } + } + } else { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.onVarTransmit; + Client.scriptEvents.addFirst(var27); + } + + var9.field2685 = Client.field648; + } + + if (var9.onInvTransmit != null && Client.field701 > var9.field2686) { + if (var9.invTransmitTriggers != null && Client.field701 - var9.field2686 <= 32) { + label859: + for (var35 = var9.field2686; var35 < Client.field701; ++var35) { + var23 = Client.changedItemContainers[var35 & 31]; + + for (var36 = 0; var36 < var9.invTransmitTriggers.length; ++var36) { + if (var23 == var9.invTransmitTriggers[var36]) { + var30 = new ScriptEvent(); + var30.widget = var9; + var30.args = var9.onInvTransmit; + Client.scriptEvents.addFirst(var30); + break label859; + } + } + } + } else { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.onInvTransmit; + Client.scriptEvents.addFirst(var27); + } + + var9.field2686 = Client.field701; + } + + if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field2687) { + if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field2687 <= 32) { + label835: + for (var35 = var9.field2687; var35 < Client.changedSkillsCount; ++var35) { + var23 = Client.changedSkills[var35 & 31]; + + for (var36 = 0; var36 < var9.statTransmitTriggers.length; ++var36) { + if (var23 == var9.statTransmitTriggers[var36]) { + var30 = new ScriptEvent(); + var30.widget = var9; + var30.args = var9.onStatTransmit; + Client.scriptEvents.addFirst(var30); + break label835; + } + } + } + } else { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.onStatTransmit; + Client.scriptEvents.addFirst(var27); + } + + var9.field2687 = Client.changedSkillsCount; + } + + if (Client.chatCycle > var9.field2583 && var9.onChatTransmit != null) { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.onChatTransmit; + Client.scriptEvents.addFirst(var27); + } + + if (Client.field711 > var9.field2583 && var9.onFriendTransmit != null) { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.onFriendTransmit; + Client.scriptEvents.addFirst(var27); + } + + if (Client.field862 > var9.field2583 && var9.onClanTransmit != null) { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.onClanTransmit; + Client.scriptEvents.addFirst(var27); + } + + if (Client.field823 > var9.field2583 && var9.onStockTransmit != null) { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.onStockTransmit; + Client.scriptEvents.addFirst(var27); + } + + if (Client.field860 > var9.field2583 && var9.field2562 != null) { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.field2562; + Client.scriptEvents.addFirst(var27); + } + + if (Client.field825 > var9.field2583 && var9.onMiscTransmit != null) { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.onMiscTransmit; + Client.scriptEvents.addFirst(var27); + } + + var9.field2583 = Client.cycleCntr; + if (var9.onKey != null) { + for (var35 = 0; var35 < Client.field849; ++var35) { + ScriptEvent var31 = new ScriptEvent(); + var31.widget = var9; + var31.keyTyped = Client.field851[var35]; + var31.keyPressed = Client.field850[var35]; + var31.args = var9.onKey; + Client.scriptEvents.addFirst(var31); + } + } + } + } + + if (!var9.isIf3) { + if (Client.clickedWidget != null || ClientPreferences.dragInventoryWidget != null || Client.isMenuOpen) { + continue; + } + + if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + if (var9.mouseOverRedirect >= 0) { + class16.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; + } else { + class16.mousedOverWidgetIf1 = var9; + } + } + + if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + class14.field90 = var9; + } + + if (var9.scrollHeight > var9.height) { + WorldMapSection2.method321(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); + } + } + + if (var9.type == 0) { + updateInterface(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); + if (var9.children != null) { + updateInterface(var9.children, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); + } + + InterfaceParent var28 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); + if (var28 != null) { + if (var28.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { + for (ScriptEvent var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) { + if (var29.isMouseInputEvent) { + var29.remove(); + var29.widget.containsMouse = false; + } + } + + if (WorldMapSection2.widgetDragDuration == 0) { + Client.clickedWidget = null; + Client.clickedWidgetParent = null; + } + + if (!Client.isMenuOpen) { + Actor.addCancelMenuEntry(); + } + } + + Buffer.updateRootInterface(var28.group, var12, var13, var14, var15, var10, var11); + } + } + } + } + } } + } } diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java index 3e24d64255..2393428d50 100644 --- a/runescape-client/src/main/java/WorldMapCacheName.java +++ b/runescape-client/src/main/java/WorldMapCacheName.java @@ -4,84 +4,146 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ab") +@ObfuscatedName("an") @Implements("WorldMapCacheName") public class WorldMapCacheName { - @ObfuscatedName("rg") - @ObfuscatedGetter( - intValue = 671141563 - ) - static int field308; - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lab;" - ) - public static final WorldMapCacheName field304; @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lab;" + signature = "Lan;" ) - public static final WorldMapCacheName field303; - @ObfuscatedName("b") + public static final WorldMapCacheName field291; + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lab;" + signature = "Lan;" ) - public static final WorldMapCacheName field307; - @ObfuscatedName("g") + public static final WorldMapCacheName field286; + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lab;" + signature = "Lan;" ) - static final WorldMapCacheName field305; - @ObfuscatedName("z") + public static final WorldMapCacheName field287; + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lab;" + signature = "Lan;" ) - public static final WorldMapCacheName field306; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -770375157 - ) - @Export("canvasHeight") - public static int canvasHeight; + static final WorldMapCacheName field288; @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "Lan;" + ) + public static final WorldMapCacheName field289; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = -1099236205 + ) + static int field293; + @ObfuscatedName("b") @Export("name") public final String name; static { - field304 = new WorldMapCacheName("details"); - field303 = new WorldMapCacheName("compositemap"); - field307 = new WorldMapCacheName("compositetexture"); - field305 = new WorldMapCacheName("area"); - field306 = new WorldMapCacheName("labels"); + field291 = new WorldMapCacheName("details"); + field286 = new WorldMapCacheName("compositemap"); + field287 = new WorldMapCacheName("compositetexture"); + field288 = new WorldMapCacheName("area"); + field289 = new WorldMapCacheName("labels"); } WorldMapCacheName(String var1) { this.name = var1; } - @ObfuscatedName("j") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "-98614245" + signature = "(B)V", + garbageValue = "-61" ) - public static void method637(boolean var0) { - if (var0 != ItemDefinition.ItemDefinition_inMembersWorld) { - WorldMapAreaData.method703(); - ItemDefinition.ItemDefinition_inMembersWorld = var0; + static void method618() { + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { + Login.currentLoginField = 1; + } else { + Login.currentLoginField = 0; } } - @ObfuscatedName("if") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "57" + signature = "(ILhz;Ljava/lang/String;Ljava/lang/String;IZI)V", + garbageValue = "-1803872156" ) - @Export("resumePauseWidget") - static void resumePauseWidget(int var0, int var1) { - PacketBufferNode var2 = ModelData0.getPacketBufferNode(ClientPacket.field2275, Client.packetWriter.isaacCipher); - var2.packetBuffer.method5613(var1); - var2.packetBuffer.writeInt(var0); - Client.packetWriter.addNode(var2); + public static void method616(int var0, AbstractArchive var1, String var2, String var3, int var4, boolean var5) { + int var6 = var1.getGroupId(var2); + int var7 = var1.getFileId(var6, var3); + class4.method59(var0, var1, var6, var7, var4, var5); + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(I)Z", + garbageValue = "-574207472" + ) + public static boolean method619() { + try { + if (class197.field2392 == 2) { + if (class197.musicTrack == null) { + class197.musicTrack = MusicTrack.readTrack(Coord.musicTrackArchive, class16.musicTrackGroupId, GrandExchangeOffer.musicTrackFileId); + if (class197.musicTrack == null) { + return false; + } + } + + if (class268.soundCache == null) { + class268.soundCache = new SoundCache(class197.soundEffectsArchive, class197.musicSamplesArchive); + } + + if (GZipDecompressor.midiPcmStream.loadMusicTrack(class197.musicTrack, class197.musicPatchesArchive, class268.soundCache, 22050)) { + GZipDecompressor.midiPcmStream.clearAll(); + GZipDecompressor.midiPcmStream.setPcmStreamVolume(class197.musicTrackVolume); + GZipDecompressor.midiPcmStream.setMusicTrack(class197.musicTrack, WorldMapDecoration.musicTrackBoolean); + class197.field2392 = 0; + class197.musicTrack = null; + class268.soundCache = null; + Coord.musicTrackArchive = null; + return true; + } + } + } catch (Exception var1) { + var1.printStackTrace(); + GZipDecompressor.midiPcmStream.clear(); + class197.field2392 = 0; + class197.musicTrack = null; + class268.soundCache = null; + Coord.musicTrackArchive = null; + } + + return false; + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(Lha;II)V", + garbageValue = "-1662716370" + ) + @Export("Widget_setKeyIgnoreHeld") + static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { + if (var0.field2626 == null) { + throw new RuntimeException(); + } else { + if (var0.field2655 == null) { + var0.field2655 = new int[var0.field2626.length]; + } + + var0.field2655[var1] = Integer.MAX_VALUE; + } + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "158917025" + ) + static final void method620() { + Tiles.method1143("You can't add yourself to your own ignore list"); } } diff --git a/runescape-client/src/main/java/WorldMapData_0.java b/runescape-client/src/main/java/WorldMapData_0.java index 8d70256700..9a43eda611 100644 --- a/runescape-client/src/main/java/WorldMapData_0.java +++ b/runescape-client/src/main/java/WorldMapData_0.java @@ -1,31 +1,36 @@ 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("r") +@ObfuscatedName("l") @Implements("WorldMapData_0") public class WorldMapData_0 extends AbstractWorldMapData { - @ObfuscatedName("gp") - @ObfuscatedSignature( - signature = "[Lln;" + @ObfuscatedName("qb") + @ObfuscatedGetter( + intValue = -1984844597 ) - @Export("mapDotSprites") - static Sprite[] mapDotSprites; + static int field92; + @ObfuscatedName("gy") + @ObfuscatedSignature( + signature = "[Lls;" + ) + @Export("headIconHintSprites") + static Sprite[] headIconHintSprites; WorldMapData_0() { } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Lkg;B)V", - garbageValue = "55" + signature = "(Lkq;I)V", + garbageValue = "-2087111410" ) @Export("init") void init(Buffer var1) { int var2 = var1.readUnsignedByte(); - if (var2 != WorldMapID.field268.value) { + if (var2 != WorldMapID.field252.value) { throw new IllegalStateException(""); } else { super.minPlane = var1.readUnsignedByte(); @@ -34,26 +39,26 @@ public class WorldMapData_0 extends AbstractWorldMapData { super.regionYLow = var1.readUnsignedShort() * 4096; super.regionX = var1.readUnsignedShort(); super.regionY = var1.readUnsignedShort(); - super.groupId = var1.method5618(); - super.fileId = var1.method5618(); + super.groupId = var1.method5560(); + super.fileId = var1.method5560(); } } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkg;B)V", - garbageValue = "35" + signature = "(Lkq;I)V", + garbageValue = "1425420215" ) @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.field166 = new byte[super.planes][64][64]; - super.field160 = new byte[super.planes][64][64]; + super.field150 = new byte[super.planes][64][64]; + super.field149 = 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.field246.value) { throw new IllegalStateException(""); } else { int var3 = var1.readUnsignedByte(); @@ -71,120 +76,151 @@ public class WorldMapData_0 extends AbstractWorldMapData { } } - public int hashCode() { - return super.regionX | super.regionY << 8; - } - public boolean equals(Object var1) { if (!(var1 instanceof WorldMapData_0)) { return false; } else { WorldMapData_0 var2 = (WorldMapData_0)var1; - return var2.regionX == super.regionX && super.regionY == var2.regionY; + return super.regionX == var2.regionX && super.regionY == var2.regionY; } } - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(Lhf;Ljava/lang/String;Ljava/lang/String;IZI)V", - garbageValue = "-2068665668" - ) - public static void method191(AbstractArchive var0, String var1, String var2, int var3, boolean var4) { - int var5 = var0.getGroupId(var1); - int var6 = var0.getFileId(var5, var2); - class65.playMusicTrack(var0, var5, var6, var3, var4); + public int hashCode() { + return super.regionX | super.regionY << 8; } - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IB)Z", - garbageValue = "121" + signature = "(Lls;IIII)V", + garbageValue = "-1317915753" ) - public static boolean method192(int var0) { - return (var0 >> 20 & 1) != 0; + static void method169(Sprite var0, int var1, int var2, int var3) { + DemotingHashTable var4 = WorldMapRegion.WorldMapRegion_cachedSprites; + long var6 = (long)(var3 << 16 | var1 << 8 | var2); + var4.put(var0, var6, var0.pixels.length * 4); } - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "0" + signature = "(IIB)I", + garbageValue = "-45" ) - static void method187() { - if (Canvas.loadWorlds()) { - Login.worldSelectOpen = true; - Login.worldSelectPage = 0; - Login.worldSelectPagesCount = 0; - } - + public static int method164(int var0, int var1) { + int var2 = var0 >>> 31; + return (var0 + var2) / var1 - var2; } - @ObfuscatedName("ab") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(ILci;ZI)I", - garbageValue = "1752052270" + signature = "(IIZB)Ljava/lang/String;", + garbageValue = "118" ) - static int method193(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.GETWINDOWMODE) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = class43.getWindowedMode(); - return 1; - } else { - int var3; - if (var0 == ScriptOpcodes.SETWINDOWMODE) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - if (var3 == 1 || var3 == 2) { - MouseHandler.setWindowedMode(var3); + static String method163(int var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { + if (var2 && var0 >= 0) { + int var3 = 2; + + for (int var4 = var0 / var1; var4 != 0; ++var3) { + var4 /= var1; } - return 1; - } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = UserComparator10.clientPreferences.windowMode; - return 1; - } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { - if (var0 == 5310) { - --GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize; - return 1; - } else { - return 2; - } - } else { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - if (var3 == 1 || var3 == 2) { - UserComparator10.clientPreferences.windowMode = var3; - class40.savePreferences(); - } + char[] var5 = new char[var3]; + var5[0] = '+'; - return 1; - } - } - } - - @ObfuscatedName("gy") - @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "-251143454" - ) - @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.field938 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { - if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { - continue; - } - - Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; + for (int var6 = var3 - 1; var6 > 0; --var6) { + int var7 = var0; + var0 /= var1; + int var8 = var7 - var0 * var1; + if (var8 >= 10) { + var5[var6] = (char)(var8 + 87); + } else { + var5[var6] = (char)(var8 + 48); } - - long var5 = MouseHandler.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); - var2.playerCycle = Client.cycle; - class2.scene.drawEntity(ClientPacket.Client_plane, var2.x, var2.y, class195.getTileHeight(var2.field938 * 64 - 64 + var2.x, var2.field938 * 64 - 64 + var2.y, ClientPacket.Client_plane), var2.field938 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); } + + return new String(var5); + } else { + return Integer.toString(var0, var1); } + } else { + throw new IllegalArgumentException("" + var1); + } + } + + @ObfuscatedName("fg") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "-991747570" + ) + @Export("forceDisconnect") + static final void forceDisconnect(int var0) { + InterfaceParent.logOut(); + switch(var0) { + case 1: + Login.loginIndex = 24; + AbstractWorldMapData.setLoginResponseString("", "You were disconnected from the server.", ""); + break; + case 2: + Login.loginIndex = 24; + AbstractWorldMapData.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); } } + + @ObfuscatedName("iy") + @ObfuscatedSignature( + signature = "(IIIII)V", + garbageValue = "-1702503786" + ) + @Export("selectSpell") + static void selectSpell(int var0, int var1, int var2, int var3) { + Widget var4 = BZip2State.getWidgetChild(var0, var1); + if (var4 != null && var4.onTargetEnter != null) { + ScriptEvent var5 = new ScriptEvent(); + var5.widget = var4; + var5.args = var4.onTargetEnter; + Client.runScriptEvent(var5); + } + + Client.field785 = var3; + Client.isSpellSelected = true; + WorldMapDecoration.selectedSpellWidget = var0; + Client.selectedSpellChildIndex = var1; + ReflectionCheck.selectedSpellFlags = var2; + LoginPacket.invalidateWidget(var4); + } + + @ObfuscatedName("jk") + @ObfuscatedSignature( + signature = "(Lha;I)Z", + garbageValue = "-2123617287" + ) + @Export("runCs1") + static final boolean runCs1(Widget var0) { + if (var0.cs1Comparisons == null) { + return false; + } else { + for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { + int var2 = User.method5076(var0, var1); + int var3 = var0.cs1ComparisonValues[var1]; + if (var0.cs1Comparisons[var1] == 2) { + if (var2 >= var3) { + return false; + } + } else if (var0.cs1Comparisons[var1] == 3) { + if (var2 <= var3) { + return false; + } + } else if (var0.cs1Comparisons[var1] == 4) { + if (var3 == var2) { + return false; + } + } else if (var3 != var2) { + return false; + } + } + + return true; + } + } } diff --git a/runescape-client/src/main/java/WorldMapData_1.java b/runescape-client/src/main/java/WorldMapData_1.java index a98e352fc8..c0e285f7b4 100644 --- a/runescape-client/src/main/java/WorldMapData_1.java +++ b/runescape-client/src/main/java/WorldMapData_1.java @@ -4,30 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ac") +@ObfuscatedName("ag") @Implements("WorldMapData_1") public class WorldMapData_1 extends AbstractWorldMapData { - @ObfuscatedName("r") + @ObfuscatedName("dp") + @ObfuscatedSignature( + signature = "Lif;" + ) + @Export("archive3") + static Archive archive3; + @ObfuscatedName("el") @ObfuscatedGetter( - intValue = 1416640575 + intValue = -88926389 + ) + @Export("port3") + static int port3; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 143866825 ) @Export("chunkXLow") int chunkXLow; - @ObfuscatedName("c") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1408474615 + intValue = -1351915861 ) @Export("chunkYLow") int chunkYLow; - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 509804669 + intValue = 1168236865 ) @Export("chunkX") int chunkX; - @ObfuscatedName("d") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 979976337 + intValue = -450265365 ) @Export("chunkY") int chunkY; @@ -35,15 +47,15 @@ public class WorldMapData_1 extends AbstractWorldMapData { WorldMapData_1() { } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Lkg;B)V", - garbageValue = "-90" + signature = "(Lkq;I)V", + garbageValue = "1553886419" ) @Export("init") void init(Buffer var1) { int var2 = var1.readUnsignedByte(); - if (var2 != WorldMapID.field264.value) { + if (var2 != WorldMapID.field253.value) { throw new IllegalStateException(""); } else { super.minPlane = var1.readUnsignedByte(); @@ -56,26 +68,26 @@ public class WorldMapData_1 extends AbstractWorldMapData { super.regionY = var1.readUnsignedShort(); this.chunkX = var1.readUnsignedByte(); this.chunkY = var1.readUnsignedByte(); - super.groupId = var1.method5618(); - super.fileId = var1.method5618(); + super.groupId = var1.method5560(); + super.fileId = var1.method5560(); } } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkg;B)V", - garbageValue = "35" + signature = "(Lkq;I)V", + garbageValue = "1425420215" ) @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.field166 = new byte[super.planes][64][64]; - super.field160 = new byte[super.planes][64][64]; + super.field150 = new byte[super.planes][64][64]; + super.field149 = 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(""); } else { int var3 = var1.readUnsignedByte(); @@ -95,30 +107,30 @@ public class WorldMapData_1 extends AbstractWorldMapData { } } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-36" + signature = "(I)I", + garbageValue = "-1398372761" ) @Export("getChunkXLow") int getChunkXLow() { return this.chunkXLow; } - @ObfuscatedName("aa") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1395211658" + garbageValue = "-2116975369" ) @Export("getChunkYLow") int getChunkYLow() { return this.chunkYLow; } - @ObfuscatedName("ab") + @ObfuscatedName("an") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-1373541715" + signature = "(B)I", + garbageValue = "-28" ) @Export("getChunkX") int getChunkX() { @@ -127,205 +139,99 @@ public class WorldMapData_1 extends AbstractWorldMapData { @ObfuscatedName("ar") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-80" + signature = "(I)I", + garbageValue = "1663251439" ) @Export("getChunkY") int getChunkY() { return this.chunkY; } + public int hashCode() { + return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; + } + public boolean equals(Object var1) { if (!(var1 instanceof WorldMapData_1)) { return false; } else { WorldMapData_1 var2 = (WorldMapData_1)var1; - if (super.regionX == var2.regionX && super.regionY == var2.regionY) { - return this.chunkX == var2.chunkX && var2.chunkY == this.chunkY; + if (super.regionX == var2.regionX && var2.regionY == super.regionY) { + return var2.chunkX == this.chunkX && this.chunkY == var2.chunkY; } else { return false; } } } - public int hashCode() { - return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; - } - @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(IIILil;IB)V", - garbageValue = "0" + signature = "(I)V", + garbageValue = "1451049643" ) - static void method737(int var0, int var1, int var2, ObjectDefinition var3, int var4) { - ObjectSound var5 = new ObjectSound(); - var5.plane = var0; - var5.x = var1 * 128; - var5.y = var2 * 128; - int var6 = var3.sizeX; - int var7 = var3.sizeY; - if (var4 == 1 || var4 == 3) { - var6 = var3.sizeY; - var7 = var3.sizeX; - } - - var5.field1074 = (var6 + var1) * 128; - var5.field1071 = (var7 + var2) * 128; - var5.soundEffectId = var3.ambientSoundId; - var5.field1072 = var3.int4 * 128; - var5.field1075 = var3.int5; - var5.field1076 = var3.int6; - var5.soundEffectIds = var3.soundEffectIds; - if (var3.transforms != null) { - var5.obj = var3; - var5.set(); - } - - ObjectSound.objectSounds.addFirst(var5); - if (var5.soundEffectIds != null) { - var5.field1078 = var5.field1075 + (int)(Math.random() * (double)(var5.field1076 - var5.field1075)); + static void method722() { + if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) { + KeyHandler.KeyHandler_keyCodes[186] = 57; + KeyHandler.KeyHandler_keyCodes[187] = 27; + KeyHandler.KeyHandler_keyCodes[188] = 71; + KeyHandler.KeyHandler_keyCodes[189] = 26; + KeyHandler.KeyHandler_keyCodes[190] = 72; + KeyHandler.KeyHandler_keyCodes[191] = 73; + KeyHandler.KeyHandler_keyCodes[192] = 58; + KeyHandler.KeyHandler_keyCodes[219] = 42; + KeyHandler.KeyHandler_keyCodes[220] = 74; + KeyHandler.KeyHandler_keyCodes[221] = 43; + KeyHandler.KeyHandler_keyCodes[222] = 59; + KeyHandler.KeyHandler_keyCodes[223] = 28; + } else { + KeyHandler.KeyHandler_keyCodes[44] = 71; + KeyHandler.KeyHandler_keyCodes[45] = 26; + KeyHandler.KeyHandler_keyCodes[46] = 72; + KeyHandler.KeyHandler_keyCodes[47] = 73; + KeyHandler.KeyHandler_keyCodes[59] = 57; + KeyHandler.KeyHandler_keyCodes[61] = 27; + KeyHandler.KeyHandler_keyCodes[91] = 42; + KeyHandler.KeyHandler_keyCodes[92] = 74; + KeyHandler.KeyHandler_keyCodes[93] = 43; + KeyHandler.KeyHandler_keyCodes[192] = 28; + KeyHandler.KeyHandler_keyCodes[222] = 58; + KeyHandler.KeyHandler_keyCodes[520] = 59; } } - @ObfuscatedName("z") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(IIIZIZB)V", - garbageValue = "111" + signature = "(IIIIIIII)Z", + garbageValue = "610798807" ) - @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 = Skills.World_worlds[var6]; - Skills.World_worlds[var6] = Skills.World_worlds[var1]; - Skills.World_worlds[var1] = var8; - - for (int var9 = var0; var9 < var1; ++var9) { - if (WorldMapEvent.method782(Skills.World_worlds[var9], var8, var2, var3, var4, var5) <= 0) { - World var10 = Skills.World_worlds[var9]; - Skills.World_worlds[var9] = Skills.World_worlds[var7]; - Skills.World_worlds[var7++] = var10; + static final boolean method699(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + int var7 = ViewportMouse.ViewportMouse_y + var6; + if (var7 < var0 && var7 < var1 && var7 < var2) { + return false; + } else { + var7 = ViewportMouse.ViewportMouse_y - var6; + if (var7 > var0 && var7 > var1 && var7 > var2) { + return false; + } else { + var7 = ViewportMouse.ViewportMouse_x + var6; + if (var7 < var3 && var7 < var4 && var7 < var5) { + return false; + } else { + var7 = ViewportMouse.ViewportMouse_x - var6; + return var7 <= var3 || var7 <= var4 || var7 <= var5; } } - - Skills.World_worlds[var1] = Skills.World_worlds[var7]; - Skills.World_worlds[var7] = var8; - doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); - doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); } - } - @ObfuscatedName("ik") + @ObfuscatedName("hz") @ObfuscatedSignature( - signature = "(IIIILjava/lang/String;B)V", - garbageValue = "84" + signature = "(I)V", + garbageValue = "-1258797506" ) - @Export("widgetDefaultMenuAction") - static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { - Widget var5 = UserComparator3.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; - WorldMapLabel.runScriptEvent(var6); - } - - boolean var8 = true; - if (var5.contentType > 0) { - var8 = WorldMapID.method567(var5); - } - - if (var8) { - if (WorldMapManager.method651(MenuAction.getWidgetClickMask(var5), var0 - 1)) { - PacketBufferNode var7; - if (var0 == 1) { - var7 = ModelData0.getPacketBufferNode(ClientPacket.field2299, Client.packetWriter.isaacCipher); - var7.packetBuffer.writeInt(var1); - var7.packetBuffer.writeShort(var2); - var7.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var7); - } - - if (var0 == 2) { - var7 = ModelData0.getPacketBufferNode(ClientPacket.field2313, Client.packetWriter.isaacCipher); - var7.packetBuffer.writeInt(var1); - var7.packetBuffer.writeShort(var2); - var7.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var7); - } - - if (var0 == 3) { - var7 = ModelData0.getPacketBufferNode(ClientPacket.field2298, Client.packetWriter.isaacCipher); - var7.packetBuffer.writeInt(var1); - var7.packetBuffer.writeShort(var2); - var7.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var7); - } - - if (var0 == 4) { - var7 = ModelData0.getPacketBufferNode(ClientPacket.field2306, Client.packetWriter.isaacCipher); - var7.packetBuffer.writeInt(var1); - var7.packetBuffer.writeShort(var2); - var7.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var7); - } - - if (var0 == 5) { - var7 = ModelData0.getPacketBufferNode(ClientPacket.field2287, Client.packetWriter.isaacCipher); - var7.packetBuffer.writeInt(var1); - var7.packetBuffer.writeShort(var2); - var7.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var7); - } - - if (var0 == 6) { - var7 = ModelData0.getPacketBufferNode(ClientPacket.field2276, Client.packetWriter.isaacCipher); - var7.packetBuffer.writeInt(var1); - var7.packetBuffer.writeShort(var2); - var7.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var7); - } - - if (var0 == 7) { - var7 = ModelData0.getPacketBufferNode(ClientPacket.field2247, Client.packetWriter.isaacCipher); - var7.packetBuffer.writeInt(var1); - var7.packetBuffer.writeShort(var2); - var7.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var7); - } - - if (var0 == 8) { - var7 = ModelData0.getPacketBufferNode(ClientPacket.field2259, Client.packetWriter.isaacCipher); - var7.packetBuffer.writeInt(var1); - var7.packetBuffer.writeShort(var2); - var7.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var7); - } - - if (var0 == 9) { - var7 = ModelData0.getPacketBufferNode(ClientPacket.field2240, Client.packetWriter.isaacCipher); - var7.packetBuffer.writeInt(var1); - var7.packetBuffer.writeShort(var2); - var7.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var7); - } - - if (var0 == 10) { - var7 = ModelData0.getPacketBufferNode(ClientPacket.field2273, Client.packetWriter.isaacCipher); - var7.packetBuffer.writeInt(var1); - var7.packetBuffer.writeShort(var2); - var7.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var7); - } - - } - } - } + static void method708() { + Client.menuOptionsCount = 0; + Client.isMenuOpen = false; } } diff --git a/runescape-client/src/main/java/WorldMapDecoration.java b/runescape-client/src/main/java/WorldMapDecoration.java index 3d08f46acb..b9f4df495f 100644 --- a/runescape-client/src/main/java/WorldMapDecoration.java +++ b/runescape-client/src/main/java/WorldMapDecoration.java @@ -3,26 +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; +import net.runelite.rs.Reflection; -@ObfuscatedName("j") +@ObfuscatedName("q") @Implements("WorldMapDecoration") public class WorldMapDecoration { - @ObfuscatedName("u") + @ObfuscatedName("c") + @Export("musicTrackBoolean") + static boolean musicTrackBoolean; + @ObfuscatedName("ei") @ObfuscatedGetter( - intValue = -1750985939 + intValue = -2012639545 + ) + static int field195; + @ObfuscatedName("lt") + @ObfuscatedGetter( + intValue = 1281740027 + ) + @Export("selectedSpellWidget") + static int selectedSpellWidget; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -213451189 ) @Export("objectDefinitionId") final int objectDefinitionId; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1852317111 + intValue = 1408254649 ) @Export("decoration") final int decoration; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -999220947 + intValue = -1062701969 ) @Export("rotation") final int rotation; @@ -33,38 +47,68 @@ public class WorldMapDecoration { this.rotation = var3; } - @ObfuscatedName("q") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(ILci;ZB)I", - garbageValue = "-80" + signature = "([BI)Lav;", + garbageValue = "-2072507802" ) - static int method355(int var0, Script var1, boolean var2) { - Widget var3 = Language.getWidget(Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]); - if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.method1655(MenuAction.getWidgetClickMask(var3)); - return 1; - } else if (var0 != ScriptOpcodes.IF_GETOP) { - if (var0 == ScriptOpcodes.IF_GETOPBASE) { - if (var3.dataText == null) { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var3.dataText; - } + static WorldMapSprite method325(byte[] var0) { + return var0 == null ? new WorldMapSprite() : new WorldMapSprite(GrandExchangeOfferTotalQuantityComparator.convertJpgToSprite(var0).pixels); + } - return 1; - } else { - return 2; - } + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;B)Ljava/lang/Class;", + garbageValue = "-53" + ) + @Export("loadClassFromDescriptor") + static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { + if (var0.equals("B")) { + return Byte.TYPE; + } else if (var0.equals("I")) { + return Integer.TYPE; + } else if (var0.equals("S")) { + return Short.TYPE; + } else if (var0.equals("J")) { + return Long.TYPE; + } else if (var0.equals("Z")) { + return Boolean.TYPE; + } else if (var0.equals("F")) { + return Float.TYPE; + } else if (var0.equals("D")) { + return Double.TYPE; + } else if (var0.equals("C")) { + return Character.TYPE; } else { - int var4 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - --var4; - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var3.actions[var4]; - } else { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; - } - - return 1; + return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); } } + + @ObfuscatedName("a") + @ObfuscatedSignature( + signature = "(I)Lli;", + garbageValue = "1591816730" + ) + static IndexedSprite method327() { + IndexedSprite var0 = new IndexedSprite(); + var0.width = class325.SpriteBuffer_spriteWidth; + var0.height = class325.SpriteBuffer_spriteHeight; + var0.xOffset = class325.SpriteBuffer_xOffsets[0]; + var0.yOffset = class325.SpriteBuffer_yOffsets[0]; + var0.subWidth = UserComparator1.SpriteBuffer_spriteWidths[0]; + var0.subHeight = class325.SpriteBuffer_spriteHeights[0]; + var0.palette = class268.SpriteBuffer_spritePalette; + var0.pixels = class290.SpriteBuffer_pixels[0]; + Message.method1223(); + return var0; + } + + @ObfuscatedName("jb") + @ObfuscatedSignature( + signature = "(I)Z", + garbageValue = "1037810196" + ) + static boolean method326() { + return Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; + } } diff --git a/runescape-client/src/main/java/WorldMapDecorationType.java b/runescape-client/src/main/java/WorldMapDecorationType.java index 8aff6240eb..59d7d89920 100644 --- a/runescape-client/src/main/java/WorldMapDecorationType.java +++ b/runescape-client/src/main/java/WorldMapDecorationType.java @@ -4,128 +4,128 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hh") +@ObfuscatedName("hs") @Implements("WorldMapDecorationType") public enum WorldMapDecorationType implements Enumerated { - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lhh;" - ) - field2748(0, 0), @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lhh;" + signature = "Lhs;" ) - field2732(1, 0), - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "Lhh;" - ) - field2727(2, 0), - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "Lhh;" - ) - field2730(3, 0), - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "Lhh;" - ) - field2731(9, 2), - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lhh;" - ) - field2739(4, 1), - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "Lhh;" - ) - field2733(5, 1), - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "Lhh;" - ) - field2734(6, 1), - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lhh;" - ) - field2735(7, 1), + field2719(0, 0), @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lhh;" + signature = "Lhs;" ) - field2729(8, 1), - @ObfuscatedName("k") + field2706(1, 0), + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lhh;" + signature = "Lhs;" ) - field2737(12, 2), - @ObfuscatedName("x") + field2710(2, 0), + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lhh;" + signature = "Lhs;" ) - field2738(13, 2), - @ObfuscatedName("o") + field2708(3, 0), + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lhh;" + signature = "Lhs;" ) - field2742(14, 2), + field2707(9, 2), + @ObfuscatedName("b") + @ObfuscatedSignature( + signature = "Lhs;" + ) + field2711(4, 1), @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lhh;" + signature = "Lhs;" ) - field2736(15, 2), - @ObfuscatedName("n") + field2724(5, 1), + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lhh;" + signature = "Lhs;" ) - field2741(16, 2), - @ObfuscatedName("r") - @ObfuscatedSignature( - signature = "Lhh;" - ) - field2740(17, 2), - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "Lhh;" - ) - field2743(18, 2), + field2712(6, 1), @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Lhh;" + signature = "Lhs;" ) - field2744(19, 2), + field2713(7, 1), @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lhh;" + signature = "Lhs;" ) - field2750(20, 2), - @ObfuscatedName("s") + field2714(8, 1), + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lhh;" + signature = "Lhs;" ) - field2746(21, 2), - @ObfuscatedName("t") + field2715(12, 2), + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lhh;" + signature = "Lhs;" ) - field2747(10, 2), - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "Lhh;" - ) - field2728(11, 2), + field2716(13, 2), @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Lhh;" + signature = "Lhs;" ) - field2749(22, 3); + field2723(14, 2), + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "Lhs;" + ) + field2721(15, 2), + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "Lhs;" + ) + field2722(16, 2), + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "Lhs;" + ) + field2720(17, 2), + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "Lhs;" + ) + field2718(18, 2), + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "Lhs;" + ) + field2717(19, 2), + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "Lhs;" + ) + field2705(20, 2), + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "Lhs;" + ) + field2709(21, 2), + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "Lhs;" + ) + field2725(10, 2), + @ObfuscatedName("h") + @ObfuscatedSignature( + signature = "Lhs;" + ) + field2726(11, 2), + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "Lhs;" + ) + field2727(22, 3); - @ObfuscatedName("q") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -719905739 + intValue = -1693964609 ) @Export("id") public final int id; @@ -138,49 +138,147 @@ public enum WorldMapDecorationType implements Enumerated { this.id = var3; } - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "7" + garbageValue = "-57" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "-242773745" + signature = "(Lhz;I)V", + garbageValue = "1637716955" ) - @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); - } + public static void method4079(AbstractArchive var0) { + FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var0; + } - if (var4.ids.length <= var1) { - int[] var5 = new int[var1 + 1]; - int[] var6 = new int[var1 + 1]; + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "(III)I", + garbageValue = "500637540" + ) + public static int method4085(int var0, int var1) { + return (var0 << 8) + var1; + } - int var7; - for (var7 = 0; var7 < var4.ids.length; ++var7) { - var5[var7] = var4.ids[var7]; - var6[var7] = var4.quantities[var7]; + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "(Lkl;IB)Z", + garbageValue = "17" + ) + @Export("updateExternalPlayer") + static boolean updateExternalPlayer(PacketBuffer var0, int var1) { + int var2 = var0.readBits(2); + int var3; + int var4; + int var7; + int var8; + int var9; + int var10; + if (var2 == 0) { + if (var0.readBits(1) != 0) { + updateExternalPlayer(var0, var1); } - for (var7 = var4.ids.length; var7 < var1; ++var7) { - var5[var7] = -1; - var6[var7] = 0; + var3 = var0.readBits(13); + var4 = var0.readBits(13); + boolean var12 = var0.readBits(1) == 1; + if (var12) { + Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; } - var4.ids = var5; - var4.quantities = var6; - } + if (Client.players[var1] != null) { + throw new RuntimeException(); + } else { + Player var6 = Client.players[var1] = new Player(); + var6.index = var1; + if (Players.field1228[var1] != null) { + var6.read(Players.field1228[var1]); + } - var4.ids[var1] = var2; - var4.quantities[var1] = var3; + var6.orientation = Players.Players_orientations[var1]; + var6.targetIndex = Players.Players_targetIndices[var1]; + var7 = Players.Players_regions[var1]; + var8 = var7 >> 28; + var9 = var7 >> 14 & 255; + var10 = var7 & 255; + var6.pathTraversed[0] = Players.field1231[var1]; + var6.plane = (byte)var8; + var6.resetPath((var9 << 13) + var3 - MusicPatchPcmStream.baseX * 64, (var10 << 13) + var4 - ScriptEvent.baseY * 64); + var6.field616 = false; + return true; + } + } else if (var2 == 1) { + var3 = var0.readBits(2); + var4 = Players.Players_regions[var1]; + Players.Players_regions[var1] = (var4 & 268435455) + (((var4 >> 28) + var3 & 3) << 28); + return false; + } else { + int var5; + int var11; + if (var2 == 2) { + var3 = var0.readBits(5); + var4 = var3 >> 3; + var5 = var3 & 7; + var11 = Players.Players_regions[var1]; + var7 = (var11 >> 28) + var4 & 3; + var8 = var11 >> 14 & 255; + var9 = var11 & 255; + if (var5 == 0) { + --var8; + --var9; + } + + if (var5 == 1) { + --var9; + } + + if (var5 == 2) { + ++var8; + --var9; + } + + if (var5 == 3) { + --var8; + } + + if (var5 == 4) { + ++var8; + } + + if (var5 == 5) { + --var8; + ++var9; + } + + if (var5 == 6) { + ++var9; + } + + if (var5 == 7) { + ++var8; + ++var9; + } + + Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); + return false; + } else { + var3 = var0.readBits(18); + var4 = var3 >> 16; + var5 = var3 >> 8 & 255; + var11 = var3 & 255; + var7 = Players.Players_regions[var1]; + var8 = (var7 >> 28) + var4 & 3; + var9 = var5 + (var7 >> 14) & 255; + var10 = var7 + var11 & 255; + Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); + return false; + } + } } } diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java index bddb111927..4a580720aa 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -4,106 +4,106 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("is") +@ObfuscatedName("it") @Implements("WorldMapElement") public class WorldMapElement extends DualNode { @ObfuscatedName("f") @ObfuscatedSignature( - signature = "[Lis;" + signature = "Lhz;" + ) + @Export("WorldMapElement_archive") + static AbstractArchive WorldMapElement_archive; + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "[Lit;" ) @Export("WorldMapElement_cached") - public static WorldMapElement[] WorldMapElement_cached; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = -960089161 - ) - @Export("WorldMapElement_count") - public static int WorldMapElement_count; - @ObfuscatedName("g") + static WorldMapElement[] WorldMapElement_cached; + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lef;" + signature = "Leb;" ) @Export("WorldMapElement_cachedSprites") - static EvictingDualNodeHashTable WorldMapElement_cachedSprites; - @ObfuscatedName("z") + public static EvictingDualNodeHashTable WorldMapElement_cachedSprites; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1817892547 + intValue = -38759309 ) @Export("objectId") public final int objectId; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -410650541 + intValue = -1854966479 ) @Export("sprite1") public int sprite1; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 840325973 + intValue = 2114919513 ) @Export("sprite2") int sprite2; - @ObfuscatedName("y") + @ObfuscatedName("x") @Export("name") public String name; - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1869859287 + intValue = -1045588681 ) - public int field3227; - @ObfuscatedName("i") + public int field3195; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1786922747 + intValue = -1328245247 ) @Export("textSize") public int textSize; - @ObfuscatedName("x") + @ObfuscatedName("o") @Export("menuActions") public String[] menuActions; - @ObfuscatedName("o") + @ObfuscatedName("v") @Export("menuTargetName") public String menuTargetName; - @ObfuscatedName("e") - int[] field3228; + @ObfuscatedName("k") + int[] field3193; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -1400114557 + ) + int field3194; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 1081967223 + ) + int field3196; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -1335511975 + ) + int field3185; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -512378151 + ) + int field3191; @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 6619485 - ) - int field3236; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = 586150611 - ) - int field3230; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 1667991799 - ) - int field3234; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = 165335677 - ) - int field3226; - @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lip;" + signature = "Liz;" ) @Export("horizontalAlignment") public HorizontalAlignment horizontalAlignment; - @ObfuscatedName("s") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lik;" + signature = "Lia;" ) @Export("verticalAlignment") public VerticalAlignment verticalAlignment; - @ObfuscatedName("t") - int[] field3235; + @ObfuscatedName("z") + int[] field3200; + @ObfuscatedName("h") + byte[] field3198; @ObfuscatedName("m") - byte[] field3217; - @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -12980215 + intValue = 1672409627 ) @Export("category") public int category; @@ -112,28 +112,28 @@ public class WorldMapElement extends DualNode { WorldMapElement_cachedSprites = new EvictingDualNodeHashTable(256); } - public WorldMapElement(int var1) { + WorldMapElement(int var1) { this.sprite1 = -1; this.sprite2 = -1; this.textSize = 0; this.menuActions = new String[5]; - this.field3236 = Integer.MAX_VALUE; - this.field3230 = Integer.MAX_VALUE; - this.field3234 = Integer.MIN_VALUE; - this.field3226 = Integer.MIN_VALUE; + this.field3194 = Integer.MAX_VALUE; + this.field3196 = Integer.MAX_VALUE; + this.field3185 = Integer.MIN_VALUE; + this.field3191 = Integer.MIN_VALUE; this.horizontalAlignment = HorizontalAlignment.HorizontalAlignment_centered; this.verticalAlignment = VerticalAlignment.VerticalAlignment_centered; this.category = -1; this.objectId = var1; } - @ObfuscatedName("f") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Lkg;I)V", - garbageValue = "-1289247667" + signature = "(Lkq;I)V", + garbageValue = "-354454893" ) @Export("decode") - public void decode(Buffer var1) { + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { @@ -144,21 +144,21 @@ public class WorldMapElement extends DualNode { } } - @ObfuscatedName("b") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lkg;II)V", - garbageValue = "946718360" + signature = "(Lkq;IB)V", + garbageValue = "-19" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { - this.sprite1 = var1.method5618(); + this.sprite1 = var1.method5560(); } else if (var2 == 2) { - this.sprite2 = var1.method5618(); + this.sprite2 = var1.method5560(); } else if (var2 == 3) { this.name = var1.readStringCp1252NullTerminated(); } else if (var2 == 4) { - this.field3227 = var1.readMedium(); + this.field3195 = var1.readMedium(); } else if (var2 == 5) { var1.readMedium(); } else if (var2 == 6) { @@ -178,32 +178,32 @@ public class WorldMapElement extends DualNode { this.menuActions[var2 - 10] = var1.readStringCp1252NullTerminated(); } else if (var2 == 15) { var3 = var1.readUnsignedByte(); - this.field3228 = new int[var3 * 2]; + this.field3193 = new int[var3 * 2]; int var4; for (var4 = 0; var4 < var3 * 2; ++var4) { - this.field3228[var4] = var1.readShort(); + this.field3193[var4] = var1.readShort(); } var1.readInt(); var4 = var1.readUnsignedByte(); - this.field3235 = new int[var4]; + this.field3200 = new int[var4]; int var5; - for (var5 = 0; var5 < this.field3235.length; ++var5) { - this.field3235[var5] = var1.readInt(); + for (var5 = 0; var5 < this.field3200.length; ++var5) { + this.field3200[var5] = var1.readInt(); } - this.field3217 = new byte[var3]; + this.field3198 = new byte[var3]; for (var5 = 0; var5 < var3; ++var5) { - this.field3217[var5] = var1.readByte(); + this.field3198[var5] = var1.readByte(); } } else if (var2 != 16) { if (var2 == 17) { this.menuTargetName = var1.readStringCp1252NullTerminated(); } else if (var2 == 18) { - var1.method5618(); + var1.method5560(); } else if (var2 == 19) { this.category = var1.readUnsignedShort(); } else if (var2 == 21) { @@ -218,48 +218,48 @@ public class WorldMapElement extends DualNode { var1.readShort(); var1.readShort(); } else if (var2 == 25) { - var1.method5618(); + var1.method5560(); } else if (var2 == 28) { var1.readUnsignedByte(); } else if (var2 == 29) { - HorizontalAlignment[] var6 = new HorizontalAlignment[]{HorizontalAlignment.field3458, HorizontalAlignment.field3462, HorizontalAlignment.HorizontalAlignment_centered}; - this.horizontalAlignment = (HorizontalAlignment)CollisionMap.findEnumerated(var6, var1.readUnsignedByte()); + this.horizontalAlignment = (HorizontalAlignment)DynamicObject.findEnumerated(UserComparator8.method3329(), var1.readUnsignedByte()); } else if (var2 == 30) { - this.verticalAlignment = (VerticalAlignment)CollisionMap.findEnumerated(ArchiveLoader.method1177(), var1.readUnsignedByte()); + VerticalAlignment[] var6 = new VerticalAlignment[]{VerticalAlignment.field3170, VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field3169}; + this.verticalAlignment = (VerticalAlignment)DynamicObject.findEnumerated(var6, var1.readUnsignedByte()); } } } } - @ObfuscatedName("g") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "147472747" + signature = "(B)V", + garbageValue = "-37" ) - public void method4461() { - if (this.field3228 != null) { - for (int var1 = 0; var1 < this.field3228.length; var1 += 2) { - if (this.field3228[var1] < this.field3236) { - this.field3236 = this.field3228[var1]; - } else if (this.field3228[var1] > this.field3234) { - this.field3234 = this.field3228[var1]; + void method4360() { + if (this.field3193 != null) { + for (int var1 = 0; var1 < this.field3193.length; var1 += 2) { + if (this.field3193[var1] < this.field3194) { + this.field3194 = this.field3193[var1]; + } else if (this.field3193[var1] > this.field3185) { + this.field3185 = this.field3193[var1]; } - if (this.field3228[var1 + 1] < this.field3230) { - this.field3230 = this.field3228[var1 + 1]; - } else if (this.field3228[var1 + 1] > this.field3226) { - this.field3226 = this.field3228[var1 + 1]; + if (this.field3193[var1 + 1] < this.field3196) { + this.field3196 = this.field3193[var1 + 1]; + } else if (this.field3193[var1 + 1] > this.field3191) { + this.field3191 = this.field3193[var1 + 1]; } } } } - @ObfuscatedName("z") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(ZI)Lln;", - garbageValue = "-39142083" + signature = "(ZI)Lls;", + garbageValue = "-899007822" ) @Export("getSpriteBool") public Sprite getSpriteBool(boolean var1) { @@ -267,10 +267,10 @@ public class WorldMapElement extends DualNode { return this.getSprite(var2); } - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(IB)Lln;", - garbageValue = "-80" + signature = "(IB)Lls;", + garbageValue = "-12" ) @Export("getSprite") Sprite getSprite(int var1) { @@ -281,7 +281,7 @@ public class WorldMapElement extends DualNode { if (var2 != null) { return var2; } else { - var2 = class288.SpriteBuffer_getSprite(class223.WorldMapElement_archive, var1, 0); + var2 = FloorUnderlayDefinition.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); if (var2 != null) { WorldMapElement_cachedSprites.put(var2, (long)var1); } @@ -291,42 +291,37 @@ public class WorldMapElement extends DualNode { } } - @ObfuscatedName("h") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(S)I", - garbageValue = "2047" + signature = "(I)I", + garbageValue = "-837340912" ) @Export("getObjectId") public int getObjectId() { return this.objectId; } - @ObfuscatedName("f") + @ObfuscatedName("kc") @ObfuscatedSignature( - signature = "(CI)C", - garbageValue = "1312574148" + signature = "(Ljava/lang/String;I)V", + garbageValue = "-61660598" ) - static char method4483(char var0) { - return var0 != 181 && var0 != 402 ? Character.toTitleCase(var0) : var0; - } + static void method4381(String var0) { + UserComparator10.field1943 = var0; - @ObfuscatedName("ix") - @ObfuscatedSignature( - signature = "(II)Ljava/lang/String;", - garbageValue = "937254693" - ) - @Export("formatItemStacks") - static final String formatItemStacks(int var0) { - String var1 = Integer.toString(var0); + try { + String var1 = class206.client.getParameter(Integer.toString(18)); + String var2 = class206.client.getParameter(Integer.toString(13)); + String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; + if (var0.length() == 0) { + var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0"; + } else { + var3 = var3 + "; Expires=" + class48.method864(WorldMapID.currentTimeMillis() + 94608000000L) + "; Max-Age=" + 94608000L; + } - for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { - var1 = var1.substring(0, var2) + "," + var1.substring(var2); + class46.method846(class206.client, "document.cookie=\"" + var3 + "\""); + } catch (Throwable var4) { } - if (var1.length() > 9) { - return " " + class222.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; - } else { - return var1.length() > 6 ? " " + class222.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + class222.colorStartTag(16776960) + var1 + ""; - } } } diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java index c7471e7a79..5e2ca42c31 100644 --- a/runescape-client/src/main/java/WorldMapEvent.java +++ b/runescape-client/src/main/java/WorldMapEvent.java @@ -1,35 +1,41 @@ -import java.io.IOException; -import java.net.Socket; +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("at") +@ObfuscatedName("al") @Implements("WorldMapEvent") public class WorldMapEvent { - @ObfuscatedName("u") + @ObfuscatedName("gu") + @ObfuscatedSignature( + signature = "[Lli;" + ) + @Export("modIconSprites") + static IndexedSprite[] modIconSprites; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -2127525977 + intValue = -458237055 ) @Export("mapElement") public int mapElement; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lhx;" + signature = "Lht;" ) @Export("coord1") public Coord coord1; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lhx;" + signature = "Lht;" ) @Export("coord2") public Coord coord2; @ObfuscatedSignature( - signature = "(ILhx;Lhx;)V" + signature = "(ILht;Lht;)V" ) public WorldMapEvent(int var1, Coord var2, Coord var3) { this.mapElement = var1; @@ -37,29 +43,88 @@ public class WorldMapEvent { this.coord2 = var3; } - @ObfuscatedName("p") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lbp;Lbp;IZIZI)I", - garbageValue = "-965478315" + signature = "(B)V", + garbageValue = "111" ) - static int method782(World var0, World var1, int var2, boolean var3, int var4, boolean var5) { - int var6 = UserComparator10.compareWorlds(var0, var1, var2, var3); - if (var6 != 0) { - return var3 ? -var6 : var6; - } else if (var4 == -1) { - return 0; - } else { - int var7 = UserComparator10.compareWorlds(var0, var1, var4, var5); - return var5 ? -var7 : var7; + static final void method764() { + if (!ViewportMouse.ViewportMouse_false0) { + int var0 = Scene.Scene_cameraPitchSine; + int var1 = Scene.Scene_cameraPitchCosine; + int var2 = Scene.Scene_cameraYawSine; + int var3 = Scene.Scene_cameraYawCosine; + byte var4 = 50; + short var5 = 3500; + int var6 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var4 / Rasterizer3D.Rasterizer3D_zoom; + int var7 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var4 / Rasterizer3D.Rasterizer3D_zoom; + int var8 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var5 / Rasterizer3D.Rasterizer3D_zoom; + int var9 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var5 / Rasterizer3D.Rasterizer3D_zoom; + int var10 = Rasterizer3D.method3019(var7, var4, var1, var0); + int var11 = Rasterizer3D.method3020(var7, var4, var1, var0); + var7 = var10; + var10 = Rasterizer3D.method3019(var9, var5, var1, var0); + int var12 = Rasterizer3D.method3020(var9, var5, var1, var0); + var9 = var10; + var10 = Rasterizer3D.method3017(var6, var11, var3, var2); + var11 = Rasterizer3D.method3083(var6, var11, var3, var2); + var6 = var10; + var10 = Rasterizer3D.method3017(var8, var12, var3, var2); + var12 = Rasterizer3D.method3083(var8, var12, var3, var2); + ViewportMouse.field1717 = (var10 + var6) / 2; + class30.field245 = (var9 + var7) / 2; + ViewportMouse.field1718 = (var12 + var11) / 2; + ViewportMouse.field1719 = (var10 - var6) / 2; + WorldMapCacheName.field293 = (var9 - var7) / 2; + class40.field336 = (var12 - var11) / 2; + ViewportMouse.field1720 = Math.abs(ViewportMouse.field1719); + class247.field3261 = Math.abs(WorldMapCacheName.field293); + MusicPatch.field2472 = Math.abs(class40.field336); } } - @ObfuscatedName("l") + @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "(Ljava/net/Socket;III)Lkn;", - garbageValue = "753193132" + signature = "(Lfl;IIS)Lcw;", + garbageValue = "14902" ) - public static AbstractSocket method783(Socket var0, int var1, int var2) throws IOException { - return new BufferedNetSocket(var0, var1, var2); + public static final PcmPlayer method763(TaskHandler var0, int var1, int var2) { + if (var1 >= 0 && var1 < 2) { + if (var2 < 256) { + var2 = 256; + } + + try { + PcmPlayer var3 = ChatChannel.pcmPlayerProvider.player(); + var3.samples = new int[(SoundCache.PcmPlayer_stereo ? 2 : 1) * 256]; + var3.field1373 = var2; + var3.init(); + var3.capacity = (var2 & -1024) + 1024; + if (var3.capacity > 16384) { + var3.capacity = 16384; + } + + var3.open(var3.capacity); + if (NPC.field1103 > 0 && HealthBar.soundSystem == null) { + HealthBar.soundSystem = new SoundSystem(); + FriendSystem.soundSystemExecutor = Executors.newScheduledThreadPool(1); + FriendSystem.soundSystemExecutor.scheduleAtFixedRate(HealthBar.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); + } + + if (HealthBar.soundSystem != null) { + if (HealthBar.soundSystem.players[var1] != null) { + throw new IllegalArgumentException(); + } + + HealthBar.soundSystem.players[var1] = var3; + } + + return var3; + } catch (Throwable var4) { + return new PcmPlayer(); + } + } else { + throw new IllegalArgumentException(); + } } } diff --git a/runescape-client/src/main/java/WorldMapID.java b/runescape-client/src/main/java/WorldMapID.java index 72671b50ae..b43cdcb883 100644 --- a/runescape-client/src/main/java/WorldMapID.java +++ b/runescape-client/src/main/java/WorldMapID.java @@ -4,44 +4,29 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ao") +@ObfuscatedName("au") @Implements("WorldMapID") public class WorldMapID { - @ObfuscatedName("po") - @Export("ClanChat_inClanChat") - static boolean ClanChat_inClanChat; - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lao;" - ) - static final WorldMapID field268; @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lao;" + signature = "Lau;" ) - static final WorldMapID field264; - @ObfuscatedName("dt") + static final WorldMapID field252; + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lij;" + signature = "Lau;" ) - @Export("archive3") - static Archive archive3; - @ObfuscatedName("fk") - @ObfuscatedSignature( - signature = "Lkf;" - ) - @Export("WorldMapElement_fonts") - static Fonts WorldMapElement_fonts; - @ObfuscatedName("b") + static final WorldMapID field253; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1597448419 + intValue = -814602649 ) @Export("value") final int value; static { - field268 = new WorldMapID(0); - field264 = new WorldMapID(1); + field252 = new WorldMapID(0); + field253 = new WorldMapID(1); } WorldMapID(int var1) { @@ -50,60 +35,130 @@ public class WorldMapID { @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "2011689467" + signature = "(I)J", + garbageValue = "1359720205" ) - public static int method566(int var0) { - --var0; - var0 |= var0 >>> 1; - var0 |= var0 >>> 2; - var0 |= var0 >>> 4; - var0 |= var0 >>> 8; - var0 |= var0 >>> 16; - return var0 + 1; + @Export("currentTimeMillis") + public static final synchronized long currentTimeMillis() { + long var0 = System.currentTimeMillis(); + if (var0 < class296.field3687) { + class296.field3688 += class296.field3687 - var0; + } + + class296.field3687 = var0; + return var0 + class296.field3688; } - @ObfuscatedName("kl") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Lhl;I)Z", - garbageValue = "1728709220" + signature = "(Lhz;I)V", + garbageValue = "817119758" ) - static final boolean method567(Widget var0) { - int var1 = var0.contentType; - if (var1 == 205) { - Client.logoutTimer = 250; + public static void method545(AbstractArchive var0) { + VarpDefinition.VarpDefinition_archive = var0; + VarpDefinition.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "(CI)Z", + garbageValue = "1021629294" + ) + @Export("isCharPrintable") + public static boolean isCharPrintable(char var0) { + if (var0 >= ' ' && var0 <= '~') { + return true; + } else if (var0 >= 160 && var0 <= 255) { return true; } else { - int var2; - int var3; - if (var1 >= 300 && var1 <= 313) { - var2 = (var1 - 300) / 2; - var3 = var1 & 1; - Client.playerAppearance.changeAppearance(var2, var3 == 1); - } - - if (var1 >= 314 && var1 <= 323) { - var2 = (var1 - 314) / 2; - var3 = var1 & 1; - Client.playerAppearance.method4068(var2, var3 == 1); - } - - if (var1 == 324) { - Client.playerAppearance.changeSex(false); - } - - if (var1 == 325) { - Client.playerAppearance.changeSex(true); - } - - if (var1 == 326) { - PacketBufferNode var4 = ModelData0.getPacketBufferNode(ClientPacket.field2322, Client.packetWriter.isaacCipher); - Client.playerAppearance.write(var4.packetBuffer); - Client.packetWriter.addNode(var4); - return true; - } else { - return false; - } + return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; } } + + @ObfuscatedName("fb") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-2121389593" + ) + static final void method546() { + for (int var0 = 0; var0 < Client.soundEffectCount; ++var0) { + int var10002 = Client.queuedSoundEffectDelays[var0]--; + if (Client.queuedSoundEffectDelays[var0] >= -10) { + SoundEffect var9 = Client.soundEffects[var0]; + if (var9 == null) { + Object var10000 = null; + var9 = SoundEffect.readSoundEffect(FloorDecoration.archive4, Client.soundEffectIds[var0], 0); + if (var9 == null) { + continue; + } + + int[] var12 = Client.queuedSoundEffectDelays; + var12[var0] += var9.calculateDelay(); + Client.soundEffects[var0] = var9; + } + + if (Client.queuedSoundEffectDelays[var0] < 0) { + int var2; + if (Client.soundLocations[var0] != 0) { + int var3 = (Client.soundLocations[var0] & 255) * 128; + int var4 = Client.soundLocations[var0] >> 16 & 255; + int var5 = var4 * 128 + 64 - Message.localPlayer.x; + if (var5 < 0) { + var5 = -var5; + } + + int var6 = Client.soundLocations[var0] >> 8 & 255; + int var7 = var6 * 128 + 64 - Message.localPlayer.y; + if (var7 < 0) { + var7 = -var7; + } + + int var8 = var7 + var5 - 128; + if (var8 > var3) { + Client.queuedSoundEffectDelays[var0] = -100; + continue; + } + + if (var8 < 0) { + var8 = 0; + } + + var2 = (var3 - var8) * Client.areaSoundEffectVolume / var3; + } else { + var2 = Client.soundEffectVolume; + } + + if (var2 > 0) { + RawSound var10 = var9.toRawSound().resample(ClientPreferences.decimator); + RawPcmStream var11 = RawPcmStream.createRawPcmStream(var10, 100, var2); + var11.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1); + Tiles.pcmStreamMixer.addSubStream(var11); + } + + Client.queuedSoundEffectDelays[var0] = -100; + } + } else { + --Client.soundEffectCount; + + for (int var1 = var0; var1 < Client.soundEffectCount; ++var1) { + Client.soundEffectIds[var1] = Client.soundEffectIds[var1 + 1]; + Client.soundEffects[var1] = Client.soundEffects[var1 + 1]; + Client.queuedSoundEffectLoops[var1] = Client.queuedSoundEffectLoops[var1 + 1]; + Client.queuedSoundEffectDelays[var1] = Client.queuedSoundEffectDelays[var1 + 1]; + Client.soundLocations[var1] = Client.soundLocations[var1 + 1]; + } + + --var0; + } + } + + if (Client.field767 && !class42.method792()) { + if (Client.musicVolume != 0 && Client.currentTrackGroupId != -1) { + class173.playMusicTrack(GrandExchangeOfferWorldComparator.archive6, Client.currentTrackGroupId, 0, Client.musicVolume, false); + } + + Client.field767 = false; + } + + } } diff --git a/runescape-client/src/main/java/WorldMapIcon_0.java b/runescape-client/src/main/java/WorldMapIcon_0.java index af74b593b0..6c0176fcb0 100644 --- a/runescape-client/src/main/java/WorldMapIcon_0.java +++ b/runescape-client/src/main/java/WorldMapIcon_0.java @@ -4,53 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("d") +@ObfuscatedName("n") @Implements("WorldMapIcon_0") public class WorldMapIcon_0 extends AbstractWorldMapIcon { - @ObfuscatedName("t") - public static String field131; - @ObfuscatedName("eh") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 720171421 - ) - @Export("port3") - static int port3; - @ObfuscatedName("gx") - @Export("xteaKeys") - static int[][] xteaKeys; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 1743201389 + intValue = -348487323 ) @Export("element") final int element; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lam;" + signature = "Law;" ) @Export("label") final WorldMapLabel label; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1823460023 + intValue = -453490289 ) @Export("subWidth") final int subWidth; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1703496191 + intValue = 350288691 ) @Export("subHeight") final int subHeight; @ObfuscatedSignature( - signature = "(Lhx;Lhx;ILam;)V" + signature = "(Lht;Lht;ILaw;)V" ) WorldMapIcon_0(Coord var1, Coord var2, int var3, WorldMapLabel var4) { super(var1, var2); this.element = var3; this.label = var4; - WorldMapElement var5 = Varcs.WorldMapElement_get(this.getElement()); + WorldMapElement var5 = GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(this.getElement()); Sprite var6 = var5.getSpriteBool(false); if (var6 != null) { this.subWidth = var6.subWidth; @@ -62,133 +51,84 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-871583687" + signature = "(B)I", + garbageValue = "63" ) @Export("getElement") public int getElement() { return this.element; } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(I)Lam;", - garbageValue = "969160497" + signature = "(I)Law;", + garbageValue = "-1801186977" ) @Export("getLabel") WorldMapLabel getLabel() { return this.label; } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-55298135" + garbageValue = "-2033351231" ) @Export("getSubWidth") int getSubWidth() { return this.subWidth; } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-51" + signature = "(I)I", + garbageValue = "1873129621" ) @Export("getSubHeight") int getSubHeight() { return this.subHeight; } - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "(Lij;II)V", - garbageValue = "1850991099" - ) - static void method224(Archive var0, int var1) { - if (class83.NetCache_reference != null) { - class83.NetCache_reference.offset = var1 * 8 + 5; - int var2 = class83.NetCache_reference.readInt(); - int var3 = class83.NetCache_reference.readInt(); - var0.loadIndex(var2, var3); - } else { - ClientPreferences.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); - NetCache.NetCache_archives[var1] = var0; - } - } + @ObfuscatedName("i") + public static String method201(long var0) { + if (var0 > 0L && var0 < 6582952005840035281L) { + if (0L == var0 % 37L) { + return null; + } else { + int var2 = 0; - @ObfuscatedName("jr") - @ObfuscatedSignature( - signature = "([Lhl;IB)V", - garbageValue = "0" - ) - @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) { - GrandExchangeEvents.runIntfCloseListeners(var4.group, var1); - } + for (long var3 = var0; 0L != var3; var3 /= 37L) { + ++var2; } - ScriptEvent var5; - if (var1 == 0 && var3.onDialogAbort != null) { - var5 = new ScriptEvent(); - var5.widget = var3; - var5.args = var3.onDialogAbort; - WorldMapLabel.runScriptEvent(var5); + StringBuilder var5 = new StringBuilder(var2); + + while (var0 != 0L) { + long var6 = var0; + var0 /= 37L; + var5.append(class288.base37Table[(int)(var6 - 37L * var0)]); } - if (var1 == 1 && var3.onSubChange != null) { - if (var3.childIndex >= 0) { - Widget var6 = Language.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; - WorldMapLabel.runScriptEvent(var5); - } + return var5.reverse().toString(); } + } else { + return null; } - } - @ObfuscatedName("kw") + @ObfuscatedName("gg") @ObfuscatedSignature( - signature = "(IIIILln;Lhn;B)V", - garbageValue = "-95" + signature = "(I)I", + garbageValue = "-1371690211" ) - @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; - class225.redHintArrowSprite.method6200(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); + static final int method202() { + if (Interpreter.clientPreferences.roofsHidden) { + return UrlRequest.Client_plane; } else { - class185.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); + int var0 = ScriptEvent.getTileHeight(MusicPatchNode2.cameraX, UserComparator9.cameraZ, UrlRequest.Client_plane); + return var0 - class60.cameraY < 800 && (Tiles.Tiles_renderFlags[UrlRequest.Client_plane][MusicPatchNode2.cameraX >> 7][UserComparator9.cameraZ >> 7] & 4) != 0 ? UrlRequest.Client_plane : 3; } - } } diff --git a/runescape-client/src/main/java/WorldMapIcon_1.java b/runescape-client/src/main/java/WorldMapIcon_1.java index f7c86d0931..3e0acbbc9d 100644 --- a/runescape-client/src/main/java/WorldMapIcon_1.java +++ b/runescape-client/src/main/java/WorldMapIcon_1.java @@ -1,52 +1,51 @@ -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("q") +@ObfuscatedName("g") @Implements("WorldMapIcon_1") public class WorldMapIcon_1 extends AbstractWorldMapIcon { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -2092116219 + intValue = 399748255 ) @Export("objectDefId") final int objectDefId; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lai;" + signature = "Las;" ) @Export("region") final WorldMapRegion region; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1422868001 + intValue = 1594551933 ) @Export("element") int element; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lam;" + signature = "Law;" ) @Export("label") WorldMapLabel label; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -900902157 + intValue = 2144976415 ) @Export("subWidth") int subWidth; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -673960603 + intValue = 649203899 ) @Export("subHeight") int subHeight; @ObfuscatedSignature( - signature = "(Lhx;Lhx;ILai;)V" + signature = "(Lht;Lht;ILas;)V" ) WorldMapIcon_1(Coord var1, Coord var2, int var3, WorldMapRegion var4) { super(var1, var2); @@ -55,56 +54,56 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { this.init(); } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-871583687" + signature = "(B)I", + garbageValue = "63" ) @Export("getElement") public int getElement() { return this.element; } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(I)Lam;", - garbageValue = "969160497" + signature = "(I)Law;", + garbageValue = "-1801186977" ) @Export("getLabel") WorldMapLabel getLabel() { return this.label; } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-55298135" + garbageValue = "-2033351231" ) @Export("getSubWidth") int getSubWidth() { return this.subWidth; } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-51" + signature = "(I)I", + garbageValue = "1873129621" ) @Export("getSubHeight") int getSubHeight() { return this.subHeight; } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1280762110" + signature = "(B)V", + garbageValue = "0" ) @Export("init") void init() { - this.element = Occluder.getObjectDefinition(this.objectDefId).transform().mapIconId; - this.label = this.region.createMapLabel(Varcs.WorldMapElement_get(this.element)); - WorldMapElement var1 = Varcs.WorldMapElement_get(this.getElement()); + this.element = Coord.getObjectDefinition(this.objectDefId).transform().mapIconId; + this.label = this.region.createMapLabel(GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(this.element)); + WorldMapElement var1 = GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(this.getElement()); Sprite var2 = var1.getSpriteBool(false); if (var2 != null) { this.subWidth = var2.subWidth; @@ -116,96 +115,79 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { } - @ObfuscatedName("aq") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "80" + signature = "(II)Lij;", + garbageValue = "-754699522" ) - static int method309(int var0) { - return (int)Math.pow(2.0D, (double)((float)var0 / 256.0F + 7.0F)); - } - - @ObfuscatedName("gx") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;ZI)V", - garbageValue = "58684745" - ) - @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 = Player.fontPlain12.lineWidth(var0, 250); - int var6 = Player.fontPlain12.lineCount(var0, 250) * 13; - Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var6 + var2, 0); - Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var6 + var2 + var2, 16777215); - Player.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); - int var7 = var3 - var2; - int var8 = var4 - var2; - int var9 = var2 + var5 + var2; - int var10 = var2 + var6 + var2; - - int var11; - for (var11 = 0; var11 < Client.rootWidgetCount; ++var11) { - if (Client.rootWidgetWidths[var11] + Client.rootWidgetXs[var11] > var7 && Client.rootWidgetXs[var11] < var9 + var7 && Client.rootWidgetYs[var11] + Client.rootWidgetHeights[var11] > var8 && Client.rootWidgetYs[var11] < var10 + var8) { - Client.field847[var11] = true; - } - } - - if (var1) { - DirectByteArrayCopier.rasterProvider.drawFull(0, 0); - } else { - var11 = var3; - int var12 = var4; - int var13 = var5; - int var14 = var6; - - for (int var15 = 0; var15 < Client.rootWidgetCount; ++var15) { - if (Client.rootWidgetXs[var15] + Client.rootWidgetWidths[var15] > var11 && Client.rootWidgetXs[var15] < var13 + var11 && Client.rootWidgetYs[var15] + Client.rootWidgetHeights[var15] > var12 && Client.rootWidgetYs[var15] < var14 + var12) { - Client.field837[var15] = true; - } - } + @Export("getParamDefinition") + public static ParamDefinition getParamDefinition(int var0) { + ParamDefinition var1 = (ParamDefinition)ParamDefinition.ParamDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = ParamDefinition.ParamDefinition_archive.takeFile(11, var0); + var1 = new ParamDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); } + var1.postDecode(); + ParamDefinition.ParamDefinition_cached.put(var1, (long)var0); + return var1; } } - @ObfuscatedName("hy") - @ObfuscatedSignature( - signature = "(III)Lfg;", - garbageValue = "1189073530" - ) - static RouteStrategy method321(int var0, int var1) { - Client.field915.approxDestinationX = var0; - Client.field915.approxDestinationY = var1; - Client.field915.approxDestinationSizeX = 1; - Client.field915.approxDestinationSizeY = 1; - return Client.field915; - } - - @ObfuscatedName("kf") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "826026682" + garbageValue = "-1785574656" ) - @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(); - } + static void method277() { + Tiles.Tiles_minPlane = 99; + class14.field88 = new byte[4][104][104]; + Tiles.field498 = new byte[4][104][104]; + Tiles.field494 = new byte[4][104][104]; + Tiles.field493 = new byte[4][104][104]; + Tiles.field501 = new int[4][105][105]; + Tiles.field496 = new byte[4][105][105]; + ArchiveLoader.field512 = new int[105][105]; + UrlRequest.Tiles_hue = new int[104]; + MenuAction.Tiles_saturation = new int[104]; + PacketBufferNode.Tiles_lightness = new int[104]; + Tiles.Tiles_hueMultiplier = new int[104]; + Varcs.field1244 = new int[104]; + } - Iterator var2 = Messages.Messages_hashTable.iterator(); + @ObfuscatedName("gp") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "57" + ) + static void method296() { + int var0 = Players.Players_count; + int[] var1 = Players.Players_indices; - while (var2.hasNext()) { - Message var3 = (Message)var2.next(); - var3.clearIsFromFriend(); - } - - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.clearFriends(); + for (int var2 = 0; var2 < var0; ++var2) { + if (var1[var2] != Client.combatTargetPlayerIndex && var1[var2] != Client.localPlayerIndex) { + class14.addPlayerToScene(Client.players[var1[var2]], true); + } } } + + @ObfuscatedName("kp") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;B)V", + garbageValue = "75" + ) + @Export("clanKickUser") + static final void clanKickUser(String var0) { + if (Calendar.clanChat != null) { + PacketBufferNode var1 = class2.getPacketBufferNode(ClientPacket.field2245, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(ViewportMouse.stringCp1252NullTerminatedByteSize(var0)); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); + } + } } diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java index 24c9950a52..9872537157 100644 --- a/runescape-client/src/main/java/WorldMapLabel.java +++ b/runescape-client/src/main/java/WorldMapLabel.java @@ -1,40 +1,48 @@ -import java.net.MalformedURLException; -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("am") +@ObfuscatedName("aw") @Implements("WorldMapLabel") public class WorldMapLabel { - @ObfuscatedName("n") - static int[][][] field233; - @ObfuscatedName("u") + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "Lal;" + ) + @Export("worldMapEvent") + static WorldMapEvent worldMapEvent; + @ObfuscatedName("go") + @ObfuscatedSignature( + signature = "[Lls;" + ) + @Export("mapDotSprites") + static Sprite[] mapDotSprites; + @ObfuscatedName("f") @Export("text") String text; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1976792999 + intValue = 1263751547 ) @Export("width") int width; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 916086533 + intValue = 1391610407 ) @Export("height") int height; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "La;" + signature = "Lj;" ) @Export("size") WorldMapLabelSize size; @ObfuscatedSignature( - signature = "(Ljava/lang/String;IILa;)V" + signature = "(Ljava/lang/String;IILj;)V" ) WorldMapLabel(String var1, int var2, int var3, WorldMapLabelSize var4) { this.text = var1; @@ -43,148 +51,20 @@ public class WorldMapLabel { this.size = var4; } - @ObfuscatedName("u") + @ObfuscatedName("fx") @ObfuscatedSignature( - signature = "(Lby;I)V", - garbageValue = "1976611888" + signature = "(I)V", + garbageValue = "1562650127" ) - @Export("runScriptEvent") - public static void runScriptEvent(ScriptEvent var0) { - GrandExchangeOfferNameComparator.runScript(var0, 500000); - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(IILfg;Lfh;I)Z", - garbageValue = "1885611430" - ) - static final boolean method434(int var0, int var1, RouteStrategy var2, CollisionMap var3) { - int var4 = var0; - int var5 = var1; - byte var6 = 64; - byte var7 = 64; - int var8 = var0 - var6; - int var9 = var1 - var7; - class173.directions[var6][var7] = 99; - class173.distances[var6][var7] = 0; - byte var10 = 0; - int var11 = 0; - class173.bufferX[var10] = var0; - byte var10001 = var10; - int var18 = var10 + 1; - class173.bufferY[var10001] = var1; - int[][] var12 = var3.flags; - - while (var18 != var11) { - var4 = class173.bufferX[var11]; - var5 = class173.bufferY[var11]; - var11 = var11 + 1 & 4095; - int var16 = var4 - var8; - int var17 = var5 - var9; - int var13 = var4 - var3.xInset; - int var14 = var5 - var3.yInset; - if (var2.hasArrived(1, var4, var5, var3)) { - class173.field2103 = var4; - class173.field2100 = var5; - return true; - } - - int var15 = class173.distances[var16][var17] + 1; - if (var16 > 0 && class173.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136776) == 0) { - class173.bufferX[var18] = var4 - 1; - class173.bufferY[var18] = var5; - var18 = var18 + 1 & 4095; - class173.directions[var16 - 1][var17] = 2; - class173.distances[var16 - 1][var17] = var15; - } - - if (var16 < 127 && class173.directions[var16 + 1][var17] == 0 && (var12[var13 + 1][var14] & 19136896) == 0) { - class173.bufferX[var18] = var4 + 1; - class173.bufferY[var18] = var5; - var18 = var18 + 1 & 4095; - class173.directions[var16 + 1][var17] = 8; - class173.distances[var16 + 1][var17] = var15; - } - - if (var17 > 0 && class173.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { - class173.bufferX[var18] = var4; - class173.bufferY[var18] = var5 - 1; - var18 = var18 + 1 & 4095; - class173.directions[var16][var17 - 1] = 1; - class173.distances[var16][var17 - 1] = var15; - } - - if (var17 < 127 && class173.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { - class173.bufferX[var18] = var4; - class173.bufferY[var18] = var5 + 1; - var18 = var18 + 1 & 4095; - class173.directions[var16][var17 + 1] = 4; - class173.distances[var16][var17 + 1] = var15; - } - - if (var16 > 0 && var17 > 0 && class173.directions[var16 - 1][var17 - 1] == 0 && (var12[var13 - 1][var14 - 1] & 19136782) == 0 && (var12[var13 - 1][var14] & 19136776) == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { - class173.bufferX[var18] = var4 - 1; - class173.bufferY[var18] = var5 - 1; - var18 = var18 + 1 & 4095; - class173.directions[var16 - 1][var17 - 1] = 3; - class173.distances[var16 - 1][var17 - 1] = var15; - } - - if (var16 < 127 && var17 > 0 && class173.directions[var16 + 1][var17 - 1] == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0 && (var12[var13 + 1][var14] & 19136896) == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { - class173.bufferX[var18] = var4 + 1; - class173.bufferY[var18] = var5 - 1; - var18 = var18 + 1 & 4095; - class173.directions[var16 + 1][var17 - 1] = 9; - class173.distances[var16 + 1][var17 - 1] = var15; - } - - if (var16 > 0 && var17 < 127 && class173.directions[var16 - 1][var17 + 1] == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0 && (var12[var13 - 1][var14] & 19136776) == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { - class173.bufferX[var18] = var4 - 1; - class173.bufferY[var18] = var5 + 1; - var18 = var18 + 1 & 4095; - class173.directions[var16 - 1][var17 + 1] = 6; - class173.distances[var16 - 1][var17 + 1] = var15; - } - - if (var16 < 127 && var17 < 127 && class173.directions[var16 + 1][var17 + 1] == 0 && (var12[var13 + 1][var14 + 1] & 19136992) == 0 && (var12[var13 + 1][var14] & 19136896) == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { - class173.bufferX[var18] = var4 + 1; - class173.bufferY[var18] = var5 + 1; - var18 = var18 + 1 & 4095; - class173.directions[var16 + 1][var17 + 1] = 12; - class173.distances[var16 + 1][var17 + 1] = var15; - } + @Export("playPcmPlayers") + static final void playPcmPlayers() { + if (NetSocket.pcmPlayer1 != null) { + NetSocket.pcmPlayer1.run(); } - class173.field2103 = var4; - class173.field2100 = var5; - return false; - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)Z", - garbageValue = "-25" - ) - @Export("isValidURL") - static boolean isValidURL(String var0) { - if (var0 == null) { - return false; - } else { - try { - new URL(var0); - return true; - } catch (MalformedURLException var2) { - return false; - } + if (UserComparator6.pcmPlayer0 != null) { + UserComparator6.pcmPlayer0.run(); } - } - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "(Lcf;I)V", - garbageValue = "1228779335" - ) - public static final void method433(class99 var0) { - Interpreter.pcmPlayerProvider = var0; } } diff --git a/runescape-client/src/main/java/WorldMapLabelSize.java b/runescape-client/src/main/java/WorldMapLabelSize.java index 1bbfe02f9d..ba9353fd69 100644 --- a/runescape-client/src/main/java/WorldMapLabelSize.java +++ b/runescape-client/src/main/java/WorldMapLabelSize.java @@ -4,114 +4,104 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("a") +@ObfuscatedName("j") @Implements("WorldMapLabelSize") public class WorldMapLabelSize { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "La;" + signature = "Lj;" ) @Export("WorldMapLabelSize_small") public static final WorldMapLabelSize WorldMapLabelSize_small; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "La;" + signature = "Lj;" ) @Export("WorldMapLabelSize_medium") public static final WorldMapLabelSize WorldMapLabelSize_medium; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "La;" + signature = "Lj;" ) @Export("WorldMapLabelSize_large") public static final WorldMapLabelSize WorldMapLabelSize_large; - @ObfuscatedName("bn") - @ObfuscatedSignature( - signature = "Llg;" - ) - @Export("loginType") - static LoginType loginType; - @ObfuscatedName("g") + @ObfuscatedName("hs") @ObfuscatedGetter( - intValue = 1166565565 + intValue = 1779595595 ) - final int field115; - @ObfuscatedName("z") + @Export("cameraYaw") + static int cameraYaw; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -2076201751 + intValue = 753179293 ) - final int field116; + final int field113; @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1814191089 + intValue = -1705085615 ) - final int field118; + final int field110; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -1894041549 + ) + final int field109; 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(2, 0, 4); + WorldMapLabelSize_medium = new WorldMapLabelSize(1, 1, 2); + WorldMapLabelSize_large = new WorldMapLabelSize(0, 2, 0); } WorldMapLabelSize(int var1, int var2, int var3) { - this.field115 = var1; - this.field116 = var2; - this.field118 = var3; + this.field113 = var1; + this.field110 = var2; + this.field109 = var3; } @ObfuscatedName("f") @ObfuscatedSignature( signature = "(FI)Z", - garbageValue = "-419042986" + garbageValue = "-886615284" ) - boolean method199(float var1) { - return var1 >= (float)this.field118; + boolean method183(float var1) { + return var1 >= (float)this.field109; } - @ObfuscatedName("u") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(B)[La;", - garbageValue = "0" + signature = "(II)Lj;", + garbageValue = "1782583414" ) - static WorldMapLabelSize[] method200() { - return new WorldMapLabelSize[]{WorldMapLabelSize_large, WorldMapLabelSize_small, WorldMapLabelSize_medium}; - } + static WorldMapLabelSize method182(int var0) { + WorldMapLabelSize[] var1 = new WorldMapLabelSize[]{WorldMapLabelSize_small, WorldMapLabelSize_large, WorldMapLabelSize_medium}; + WorldMapLabelSize[] var2 = var1; - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(I)[Lgm;", - garbageValue = "-1817209959" - ) - @Export("ServerPacket_values") - public static ServerPacket[] ServerPacket_values() { - return new ServerPacket[]{ServerPacket.field2132, ServerPacket.field2185, ServerPacket.field2193, ServerPacket.field2134, ServerPacket.field2129, ServerPacket.field2156, ServerPacket.field2173, ServerPacket.field2135, ServerPacket.field2138, ServerPacket.field2137, ServerPacket.field2155, ServerPacket.field2163, ServerPacket.field2133, ServerPacket.field2151, ServerPacket.field2142, ServerPacket.field2143, ServerPacket.field2130, ServerPacket.field2145, ServerPacket.field2146, ServerPacket.field2199, ServerPacket.field2148, ServerPacket.field2149, ServerPacket.field2150, ServerPacket.field2141, ServerPacket.field2144, ServerPacket.field2153, ServerPacket.field2154, ServerPacket.field2198, ServerPacket.field2140, ServerPacket.field2157, ServerPacket.field2158, ServerPacket.field2159, ServerPacket.field2160, ServerPacket.field2161, ServerPacket.field2162, ServerPacket.field2184, ServerPacket.field2164, ServerPacket.field2192, ServerPacket.field2166, ServerPacket.field2167, ServerPacket.field2168, ServerPacket.field2212, ServerPacket.field2170, ServerPacket.field2171, ServerPacket.field2169, ServerPacket.field2136, ServerPacket.field2174, ServerPacket.field2175, ServerPacket.field2176, ServerPacket.field2177, ServerPacket.field2178, ServerPacket.field2179, ServerPacket.field2180, ServerPacket.field2181, ServerPacket.field2182, ServerPacket.field2183, ServerPacket.field2204, ServerPacket.field2152, ServerPacket.field2196, ServerPacket.field2187, ServerPacket.field2188, ServerPacket.field2128, ServerPacket.field2190, ServerPacket.field2191, ServerPacket.field2131, ServerPacket.field2139, ServerPacket.field2194, ServerPacket.field2165, ServerPacket.field2147, ServerPacket.field2197, ServerPacket.field2202, ServerPacket.field2172, ServerPacket.field2200, ServerPacket.field2201, ServerPacket.field2189, ServerPacket.field2203, ServerPacket.field2205, ServerPacket.field2186, ServerPacket.field2206, ServerPacket.field2207, ServerPacket.field2208, ServerPacket.field2209, ServerPacket.field2210, ServerPacket.field2211, ServerPacket.field2213, ServerPacket.field2195}; - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "(II)La;", - garbageValue = "1217781091" - ) - static WorldMapLabelSize method209(int var0) { - WorldMapLabelSize[] var1 = method200(); - - for (int var2 = 0; var2 < var1.length; ++var2) { - WorldMapLabelSize var3 = var1[var2]; - if (var0 == var3.field116) { - return var3; + for (int var3 = 0; var3 < var2.length; ++var3) { + WorldMapLabelSize var4 = var2[var3]; + if (var0 == var4.field110) { + return var4; } } return null; } - @ObfuscatedName("lx") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-673995874" + signature = "(ILkg;Lif;I)V", + garbageValue = "408985273" ) - static void method208() { - Client.packetWriter.addNode(ModelData0.getPacketBufferNode(ClientPacket.field2272, Client.packetWriter.isaacCipher)); - Client.oculusOrbState = 0; + static void method186(int var0, ArchiveDisk var1, Archive var2) { + ArchiveDiskAction var3 = new ArchiveDiskAction(); + var3.type = 1; + var3.key = (long)var0; + var3.archiveDisk = var1; + var3.archive = var2; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); + } + + class32.method549(); } } diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java index ae1d624e30..f9f3ba2af9 100644 --- a/runescape-client/src/main/java/WorldMapManager.java +++ b/runescape-client/src/main/java/WorldMapManager.java @@ -8,100 +8,121 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("ar") @Implements("WorldMapManager") public final class WorldMapManager { - @ObfuscatedName("by") - static String field327; - @ObfuscatedName("u") + @ObfuscatedName("dd") + @ObfuscatedSignature( + signature = "Lif;" + ) + @Export("archive9") + static Archive archive9; + @ObfuscatedName("hq") + @ObfuscatedGetter( + intValue = -652889909 + ) + static int field314; + @ObfuscatedName("jp") + @ObfuscatedSignature( + signature = "Lha;" + ) + static Widget field312; + @ObfuscatedName("ku") + @ObfuscatedGetter( + intValue = -1617122989 + ) + @Export("menuY") + static int menuY; + @ObfuscatedName("f") @Export("loaded") boolean loaded; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("loadStarted") boolean loadStarted; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Laq;" + signature = "Lay;" ) @Export("mapAreaData") WorldMapAreaData mapAreaData; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lln;" + signature = "Lls;" ) @Export("compositeTextureSprite") Sprite compositeTextureSprite; - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("icons") HashMap icons; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "[[Lai;" + signature = "[[Las;" ) @Export("regions") WorldMapRegion[][] regions; - @ObfuscatedName("h") - HashMap field316; - @ObfuscatedName("y") + @ObfuscatedName("e") + HashMap field297; + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "[Llm;" + signature = "[Lli;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Lhf;" + signature = "Lhz;" ) @Export("geographyArchive") final AbstractArchive geographyArchive; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lhf;" + signature = "Lhz;" ) @Export("groundArchive") final AbstractArchive groundArchive; - @ObfuscatedName("k") + @ObfuscatedName("c") @Export("fonts") final HashMap fonts; - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1863582425 + intValue = -517203904 ) @Export("tileX") int tileX; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 782460107 + intValue = 800911040 ) @Export("tileY") int tileY; - @ObfuscatedName("e") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1124453587 + intValue = -2082991249 ) @Export("tileWidth") int tileWidth; - @ObfuscatedName("n") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 335024989 + intValue = 1520705984 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1803462463 + intValue = -1382078931 ) @Export("pixelsPerTile") public int pixelsPerTile; @ObfuscatedSignature( - signature = "([Llm;Ljava/util/HashMap;Lhf;Lhf;)V" + signature = "([Lli;Ljava/util/HashMap;Lhz;Lhz;)V" ) public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3, AbstractArchive var4) { this.loaded = false; this.loadStarted = false; - this.field316 = new HashMap(); + this.field297 = new HashMap(); this.pixelsPerTile = 0; this.mapSceneSprites = var1; this.fonts = var2; @@ -109,10 +130,10 @@ public final class WorldMapManager { this.groundArchive = var4; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Lhf;Ljava/lang/String;ZB)V", - garbageValue = "42" + signature = "(Lhz;Ljava/lang/String;ZI)V", + garbageValue = "1815825171" ) @Export("load") public void load(AbstractArchive var1, String var2, boolean var3) { @@ -120,10 +141,10 @@ public final class WorldMapManager { this.loaded = false; this.loadStarted = true; System.nanoTime(); - int var4 = var1.getGroupId(WorldMapCacheName.field304.name); + int var4 = var1.getGroupId(WorldMapCacheName.field291.name); int var5 = var1.getFileId(var4, var2); - Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field304.name, var2)); - Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field303.name, var2)); + Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field291.name, var2)); + Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field286.name, var2)); System.nanoTime(); System.nanoTime(); this.mapAreaData = new WorldMapAreaData(); @@ -137,15 +158,15 @@ public final class WorldMapManager { this.mapAreaData.getOriginX(); this.mapAreaData.getOriginPlane(); this.mapAreaData.getOriginY(); - this.tileX = this.mapAreaData.getRegionLowX() * 64; - this.tileY = this.mapAreaData.getRegionLowY() * 64; + this.tileX = this.mapAreaData.getRegionLowX() * 4096; + this.tileY = this.mapAreaData.getRegionLowY() * 4096; this.tileWidth = (this.mapAreaData.getRegionHighX() - this.mapAreaData.getRegionLowX() + 1) * 64; - this.tileHeight = (this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1) * 64; + this.tileHeight = (this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1) * 4096; int var16 = this.mapAreaData.getRegionHighX() - this.mapAreaData.getRegionLowX() + 1; int var9 = this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1; System.nanoTime(); System.nanoTime(); - GrandExchangeOfferAgeComparator.WorldMapRegion_clearCachedSprites(); + WorldMapRegion.WorldMapRegion_cachedSprites.clear(); this.regions = new WorldMapRegion[var16][var9]; Iterator var10 = this.mapAreaData.worldMapData0Set.iterator(); @@ -170,9 +191,9 @@ public final class WorldMapManager { System.nanoTime(); System.nanoTime(); - if (var1.isValidFileName(WorldMapCacheName.field307.name, var2)) { - byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field307.name, var2); - this.compositeTextureSprite = MouseHandler.convertJpgToSprite(var20); + if (var1.isValidFileName(WorldMapCacheName.field287.name, var2)) { + byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field287.name, var2); + this.compositeTextureSprite = GrandExchangeOfferTotalQuantityComparator.convertJpgToSprite(var20); } System.nanoTime(); @@ -182,20 +203,20 @@ public final class WorldMapManager { } } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "-41" + garbageValue = "29" ) @Export("clearIcons") public final void clearIcons() { this.icons = null; } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(IIIIIIIII)V", - garbageValue = "2003295664" + signature = "(IIIIIIIIB)V", + garbageValue = "-92" ) @Export("drawTiles") public final void drawTiles(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { @@ -208,49 +229,49 @@ public final class WorldMapManager { float var14 = this.getPixelsPerTile(var7 - var5, var3 - var1); int var15 = (int)Math.ceil((double)var14); this.pixelsPerTile = var15; - if (!this.field316.containsKey(var15)) { + if (!this.field297.containsKey(var15)) { class40 var16 = new class40(var15); var16.init(); - this.field316.put(var15, var16); + this.field297.put(var15, var16); } - int var23 = var13.width + var13.x - 1; + int var23 = var13.x + var13.width - 1; int var17 = var13.height + var13.y - 1; int var18; int var19; for (var18 = var13.x; var18 <= var23; ++var18) { for (var19 = var13.y; var19 <= var17; ++var19) { - this.regions[var18][var19].drawTile(var15, (class40)this.field316.get(var15), this.mapSceneSprites, this.geographyArchive, this.groundArchive); + this.regions[var18][var19].drawTile(var15, (class40)this.field297.get(var15), this.mapSceneSprites, this.geographyArchive, this.groundArchive); } } Rasterizer2D.Rasterizer2D_replace(var9, var10, var11); Rasterizer2D.Rasterizer2D_setClipArray(var12); - var18 = (int)(64.0F * var14); - var19 = this.tileX * 4096 + var1; - int var20 = this.tileY * 4096 + var2; + var18 = (int)(var14 * 64.0F); + var19 = this.tileX * 64 + var1; + int var20 = this.tileY * 64 + var2; for (int var21 = var13.x; var21 < var13.width + var13.x; ++var21) { - for (int var22 = var13.y; var22 < var13.height + var13.y; ++var22) { - this.regions[var21][var22].method460(var5 + var18 * (this.regions[var21][var22].regionX * 64 - var19) / 64, var8 - var18 * (this.regions[var21][var22].regionY * 64 - var20 + 64) / 64, var18); + for (int var22 = var13.y; var22 < var13.y + var13.height; ++var22) { + this.regions[var21][var22].method417(var5 + var18 * (this.regions[var21][var22].regionX * 64 - var19) / 64, var8 - var18 * (this.regions[var21][var22].regionY * 64 - var20 + 64) / 64, var18); } } } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZI)V", - garbageValue = "-607313311" + garbageValue = "64885901" ) @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 var17 = this.tileX * 64 + var1; + int var18 = this.tileY * 64 + var2; int var19; int var20; @@ -260,13 +281,13 @@ public final class WorldMapManager { this.regions[var19][var20].initWorldMapIcon1s(); } - this.regions[var19][var20].method446(var5 + var16 * (this.regions[var19][var20].regionX * 64 - var17) / 64, var8 - var16 * (this.regions[var19][var20].regionY * 64 - var18 + 64) / 64, var16, var9); + this.regions[var19][var20].method427(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) { + for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) { + for (var20 = var14.y; var20 < var14.y + var14.height; ++var20) { this.regions[var19][var20].flashElements(var10, var11, var12); } } @@ -274,10 +295,10 @@ public final class WorldMapManager { } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(IIIILjava/util/HashSet;IIB)V", - garbageValue = "63" + signature = "(IIIILjava/util/HashSet;IIS)V", + garbageValue = "5037" ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4, HashSet var5, int var6, int var7) { @@ -305,8 +326,8 @@ public final class WorldMapManager { while (var11.hasNext()) { AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var11.next(); - int var13 = var3 * (var12.coord2.x - this.tileX * 4096) / (this.tileWidth * 4096); - int var14 = var4 - (var12.coord2.y - this.tileY * 4096) * var4 / (this.tileHeight * 4096); + int var13 = var3 * (var12.coord2.x - this.tileX * 64) / (this.tileWidth * 4096); + int var14 = var4 - var4 * (var12.coord2.y - this.tileY * 64) / (this.tileHeight * 64); Rasterizer2D.Rasterizer2D_drawCircleAlpha(var13 + var1, var14 + var2, 2, 16776960, 256); } } @@ -314,12 +335,12 @@ public final class WorldMapManager { } } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( signature = "(IIIIIIIIIIB)Ljava/util/List;", - garbageValue = "0" + garbageValue = "-26" ) - public List method645(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { + public List method647(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; @@ -327,12 +348,12 @@ public final class WorldMapManager { 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; + int var15 = this.tileX * 64 + var1; + int var16 = this.tileY * 64 + var2; - for (int var17 = var12.x; var17 < var12.x + var12.width; ++var17) { + for (int var17 = var12.x; var17 < var12.width + var12.x; ++var17) { for (int var18 = var12.y; var18 < var12.height + var12.y; ++var18) { - List var19 = this.regions[var17][var18].method467(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); + List var19 = this.regions[var17][var18].method498(var5 + var14 * (this.regions[var17][var18].regionX * 64 - var15) / 64, var8 + var6 - var14 * (this.regions[var17][var18].regionY * 64 - var16 + 64) / 64, var14, var9, var10); if (!var19.isEmpty()) { var11.addAll(var19); } @@ -343,18 +364,18 @@ public final class WorldMapManager { } } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(IIIII)Lv;", - garbageValue = "-662706670" + signature = "(IIIII)Lm;", + garbageValue = "1308551287" ) @Export("createWorldMapRectangle") WorldMapRectangle createWorldMapRectangle(int var1, int var2, int var3, int var4) { WorldMapRectangle var5 = new WorldMapRectangle(this); - int var6 = this.tileX * 4096 + var1; - int var7 = this.tileY * 4096 + var2; - int var8 = var3 + this.tileX * 4096; - int var9 = this.tileY * 4096 + var4; + int var6 = this.tileX * 64 + var1; + int var7 = this.tileY * 64 + var2; + int var8 = var3 + this.tileX * 64; + int var9 = this.tileY * 64 + var4; int var10 = var6 / 64; int var11 = var7 / 64; int var12 = var8 / 64; @@ -386,20 +407,20 @@ public final class WorldMapManager { return var5; } - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "164823624" + signature = "(B)Z", + garbageValue = "1" ) @Export("isLoaded") public boolean isLoaded() { return this.loaded; } - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(B)Ljava/util/HashMap;", - garbageValue = "-124" + signature = "(I)Ljava/util/HashMap;", + garbageValue = "1748000895" ) @Export("buildIcons") public HashMap buildIcons() { @@ -407,10 +428,10 @@ public final class WorldMapManager { return this.icons; } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "304580101" + garbageValue = "-1796142123" ) @Export("buildIcons0") void buildIcons0() { @@ -444,10 +465,10 @@ public final class WorldMapManager { } - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(III)F", - garbageValue = "-2138460043" + garbageValue = "2117368488" ) @Export("getPixelsPerTile") float getPixelsPerTile(int var1, int var2) { @@ -462,31 +483,151 @@ public final class WorldMapManager { } } - @ObfuscatedName("f") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(IIS)Z", - garbageValue = "-1777" + signature = "(ILcu;ZB)I", + garbageValue = "0" ) - public static boolean method651(int var0, int var1) { - return (var0 >> var1 + 1 & 1) != 0; + static int method656(int var0, Script var1, boolean var2) { + int var3; + int var4; + if (var0 == ScriptOpcodes.CC_CREATE) { + class188.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + int var5 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 2]; + if (var4 == 0) { + throw new RuntimeException(); + } else { + Widget var6 = Tile.getWidget(var3); + if (var6.children == null) { + var6.children = new Widget[var5 + 1]; + } + + if (var6.children.length <= var5) { + Widget[] var7 = new Widget[var5 + 1]; + + for (int var8 = 0; var8 < var6.children.length; ++var8) { + var7[var8] = var6.children[var8]; + } + + var6.children = var7; + } + + if (var5 > 0 && var6.children[var5 - 1] == null) { + throw new RuntimeException("" + (var5 - 1)); + } else { + Widget var12 = new Widget(); + var12.type = var4; + var12.parentId = var12.id = var6.id; + var12.childIndex = var5; + var12.isIf3 = true; + var6.children[var5] = var12; + if (var2) { + UserComparator7.field1946 = var12; + } else { + class197.field2398 = var12; + } + + LoginPacket.invalidateWidget(var6); + return 1; + } + } + } else { + Widget var9; + if (var0 == ScriptOpcodes.CC_DELETE) { + var9 = var2 ? UserComparator7.field1946 : class197.field2398; + Widget var10 = Tile.getWidget(var9.id); + var10.children[var9.childIndex] = null; + LoginPacket.invalidateWidget(var10); + return 1; + } else if (var0 == ScriptOpcodes.CC_DELETEALL) { + var9 = Tile.getWidget(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); + var9.children = null; + LoginPacket.invalidateWidget(var9); + return 1; + } else if (var0 != ScriptOpcodes.CC_FIND) { + if (var0 == ScriptOpcodes.IF_FIND) { + var9 = Tile.getWidget(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); + if (var9 != null) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 1; + if (var2) { + UserComparator7.field1946 = var9; + } else { + class197.field2398 = var9; + } + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else { + return 2; + } + } else { + class188.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + Widget var11 = BZip2State.getWidgetChild(var3, var4); + if (var11 != null && var4 != -1) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 1; + if (var2) { + UserComparator7.field1946 = var11; + } else { + class197.field2398 = var11; + } + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } + } } - @ObfuscatedName("fl") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "1348135322" + signature = "(CI)Z", + garbageValue = "1068485725" ) - static void method676(int var0, int var1) { - int[] var2 = new int[9]; + @Export("isCharAlphabetic") + public static boolean isCharAlphabetic(char var0) { + return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; + } - for (int var3 = 0; var3 < var2.length; ++var3) { - int var4 = var3 * 32 + 15 + 128; - int var5 = FloorDecoration.method2888(var4); - int var6 = Rasterizer3D.Rasterizer3D_sine[var4]; - var5 = class14.method176(var5, var1); - var2[var3] = var6 * var5 >> 16; + @ObfuscatedName("ha") + @ObfuscatedSignature( + signature = "(III)I", + garbageValue = "1926930622" + ) + static int method635(int var0, int var1) { + int var2 = var1 - 334; + if (var2 < 0) { + var2 = 0; + } else if (var2 > 100) { + var2 = 100; } - Scene.Scene_buildVisiblityMap(var2, 500, 800, var0 * 334 / var1, 334); + int var3 = (Client.zoomWidth - Client.zoomHeight) * var2 / 100 + Client.zoomHeight; + return var0 * var3 / 256; + } + + @ObfuscatedName("lh") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "933243539" + ) + static String method662(String var0) { + PlayerType[] var1 = MusicPatchPcmStream.PlayerType_values(); + + for (int var2 = 0; var2 < var1.length; ++var2) { + PlayerType var3 = var1[var2]; + if (var3.modIcon != -1 && var0.startsWith(ChatChannel.method2269(var3.modIcon))) { + var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); + break; + } + } + + return var0; } } diff --git a/runescape-client/src/main/java/WorldMapRectangle.java b/runescape-client/src/main/java/WorldMapRectangle.java index 57978cb542..f941ac9f2a 100644 --- a/runescape-client/src/main/java/WorldMapRectangle.java +++ b/runescape-client/src/main/java/WorldMapRectangle.java @@ -3,31 +3,38 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("v") +@ObfuscatedName("m") @Implements("WorldMapRectangle") public final class WorldMapRectangle { - @ObfuscatedName("u") + @ObfuscatedName("sh") + @ObfuscatedSignature( + signature = "Lkg;" + ) + @Export("masterDisk") + static ArchiveDisk masterDisk; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1021156023 + intValue = -2130750927 ) @Export("width") int width; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1442347119 + intValue = -2077652257 ) @Export("height") int height; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 611193367 + intValue = -1828733085 ) @Export("x") int x; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -782964479 + intValue = 1246600449 ) @Export("y") int y; @@ -44,56 +51,531 @@ public final class WorldMapRectangle { this.this$0 = var1; } - @ObfuscatedName("u") + @ObfuscatedName("aj") @ObfuscatedSignature( - signature = "(II)Lii;", - garbageValue = "-3287437" + signature = "(ILcu;ZI)I", + garbageValue = "-1751394483" ) - @Export("FloorUnderlayDefinition_get") - public static FloorOverlayDefinition FloorUnderlayDefinition_get(int var0) { - FloorOverlayDefinition var1 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; + static int method273(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 6600) { + var3 = UrlRequest.Client_plane; + int var9 = MusicPatchPcmStream.baseX * 64 + (Message.localPlayer.x >> 7); + int var5 = ScriptEvent.baseY * 64 + (Message.localPlayer.y >> 7); + Canvas.getWorldMap().method6367(var3, var9, var5, true); + return 1; } else { - byte[] var2 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var0); - var1 = new FloorOverlayDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2), var0); - } + WorldMapArea var11; + if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + String var16 = ""; + var11 = Canvas.getWorldMap().getMapArea(var3); + if (var11 != null) { + var16 = var11.getExternalName(); + } - var1.postDecode(); - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var1, (long)var0); - return var1; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var16; + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + Canvas.getWorldMap().setCurrentMapAreaId(var3); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Canvas.getWorldMap().getZoomLevel(); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + Canvas.getWorldMap().setZoomPercentage(var3); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Canvas.getWorldMap().isCacheLoaded() ? 1 : 0; + return 1; + } else { + Coord var15; + if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { + var15 = new Coord(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); + Canvas.getWorldMap().setWorldMapPositionTarget(var15.x, var15.y); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { + var15 = new Coord(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); + Canvas.getWorldMap().setWorldMapPositionTargetInstant(var15.x, var15.y); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { + var15 = new Coord(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); + Canvas.getWorldMap().jumpToSourceCoord(var15.plane, var15.x, var15.y); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { + var15 = new Coord(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); + Canvas.getWorldMap().jumpToSourceCoordInstant(var15.plane, var15.x, var15.y); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Canvas.getWorldMap().getDisplayX(); + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Canvas.getWorldMap().getDisplayY(); + return 1; + } else { + WorldMapArea var13; + if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + var13 = Canvas.getWorldMap().getMapArea(var3); + if (var13 == null) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var13.getOrigin().packed(); + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + var13 = Canvas.getWorldMap().getMapArea(var3); + if (var13 == null) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = (var13.getRegionHighX() - var13.getRegionLowX() + 1) * 64; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = (var13.getRegionHighY() - var13.getRegionLowY() + 1) * 64; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + var13 = Canvas.getWorldMap().getMapArea(var3); + if (var13 == null) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var13.getRegionLowX() * 64; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var13.getRegionLowY() * 64; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var13.getRegionHighX() * 64 + 64 - 1; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var13.getRegionHighY() * 64 + 64 - 1; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + var13 = Canvas.getWorldMap().getMapArea(var3); + if (var13 == null) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var13.getZoom(); + } + + return 1; + } else if (var0 == 6615) { + var15 = Canvas.getWorldMap().getDisplayCoord(); + if (var15 == null) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var15.x; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var15.y; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Canvas.getWorldMap().currentMapAreaId(); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { + var15 = new Coord(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); + var13 = Canvas.getWorldMap().getCurrentMapArea(); + if (var13 == null) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; + return 1; + } else { + int[] var14 = var13.position(var15.plane, var15.x, var15.y); + if (var14 == null) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var14[0]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var14[1]; + } + + return 1; + } + } else { + Coord var7; + if (var0 == 6618) { + var15 = new Coord(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); + var13 = Canvas.getWorldMap().getCurrentMapArea(); + if (var13 == null) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; + return 1; + } else { + var7 = var13.coord(var15.x, var15.y); + if (var7 == null) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var7.packed(); + } + + return 1; + } + } else { + Coord var12; + if (var0 == 6619) { + class188.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var12 = new Coord(Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]); + GrandExchangeEvent.method80(var3, var12, false); + return 1; + } else if (var0 == 6620) { + class188.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var12 = new Coord(Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]); + GrandExchangeEvent.method80(var3, var12, true); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { + class188.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var12 = new Coord(Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]); + var11 = Canvas.getWorldMap().getMapArea(var3); + if (var11 == null) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + return 1; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var11.containsCoord(var12.plane, var12.x, var12.y) ? 1 : 0; + return 1; + } + } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Canvas.getWorldMap().getDisplayWith(); + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Canvas.getWorldMap().getDisplayHeight(); + return 1; + } else if (var0 == 6623) { + var15 = new Coord(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); + var13 = Canvas.getWorldMap().mapAreaAtCoord(var15.plane, var15.x, var15.y); + if (var13 == null) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var13.getId(); + } + + return 1; + } else if (var0 == 6624) { + Canvas.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); + return 1; + } else if (var0 == 6625) { + Canvas.getWorldMap().resetMaxFlashCount(); + return 1; + } else if (var0 == 6626) { + Canvas.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); + return 1; + } else if (var0 == 6627) { + Canvas.getWorldMap().resetCyclesPerFlash(); + return 1; + } else { + boolean var10; + if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { + var10 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + Canvas.getWorldMap().setPerpetualFlash(var10); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + Canvas.getWorldMap().flashElement(var3); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + Canvas.getWorldMap().flashCategory(var3); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { + Canvas.getWorldMap().stopCurrentFlashes(); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { + var10 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + Canvas.getWorldMap().setElementsDisabled(var10); + return 1; + } else { + boolean var4; + if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { + class188.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1] == 1; + Canvas.getWorldMap().disableElement(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { + class188.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1] == 1; + Canvas.getWorldMap().setCategoryDisabled(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Canvas.getWorldMap().getElementsDisabled() ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Canvas.getWorldMap().isElementDisabled(var3) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Canvas.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; + return 1; + } else if (var0 == 6638) { + class188.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var12 = new Coord(Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]); + var7 = Canvas.getWorldMap().method6416(var3, var12); + if (var7 == null) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var7.packed(); + } + + return 1; + } else { + AbstractWorldMapIcon var8; + if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { + var8 = Canvas.getWorldMap().iconStart(); + if (var8 == null) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var8.getElement(); + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var8.coord2.packed(); + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { + var8 = Canvas.getWorldMap().iconNext(); + if (var8 == null) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var8.getElement(); + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var8.coord2.packed(); + } + + return 1; + } else { + WorldMapElement var6; + if (var0 == ScriptOpcodes.MEC_TEXT) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + var6 = GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(var3); + if (var6.name == null) { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var6.name; + } + + return 1; + } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + var6 = GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(var3); + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var6.textSize; + return 1; + } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + var6 = GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(var3); + if (var6 == null) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var6.category; + } + + return 1; + } else if (var0 == ScriptOpcodes.MEC_SPRITE) { + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + var6 = GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(var3); + if (var6 == null) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var6.sprite1; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = WorldMapLabel.worldMapEvent.mapElement; + return 1; + } else if (var0 == 6698) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = WorldMapLabel.worldMapEvent.coord1.packed(); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = WorldMapLabel.worldMapEvent.coord2.packed(); + return 1; + } else { + return 2; + } + } + } + } + } + } + } + } + } } } - @ObfuscatedName("gm") + @ObfuscatedName("go") @ObfuscatedSignature( - signature = "(Lbg;III)V", - garbageValue = "-1866889280" + signature = "(B)I", + garbageValue = "66" ) - @Export("performPlayerAnimation") - static void performPlayerAnimation(Player var0, int var1, int var2) { - if (var0.sequence == var1 && var1 != -1) { - int var3 = GrandExchangeOfferAgeComparator.SequenceDefinition_get(var1).field3533; - if (var3 == 1) { - var0.sequenceFrame = 0; - var0.sequenceFrameCycle = 0; - var0.sequenceDelay = var2; - var0.field971 = 0; + static final int method275() { + if (Interpreter.clientPreferences.roofsHidden) { + return UrlRequest.Client_plane; + } else { + int var0 = 3; + if (ViewportMouse.cameraPitch < 310) { + int var1; + int var2; + if (Client.oculusOrbState == 1) { + var1 = WorldMapSectionType.oculusOrbFocalPointX >> 7; + var2 = Language.oculusOrbFocalPointY >> 7; + } else { + var1 = Message.localPlayer.x >> 7; + var2 = Message.localPlayer.y >> 7; + } + + int var3 = MusicPatchNode2.cameraX >> 7; + int var4 = UserComparator9.cameraZ >> 7; + if (var3 < 0 || var4 < 0 || var3 >= 104 || var4 >= 104) { + return UrlRequest.Client_plane; + } + + if (var1 < 0 || var2 < 0 || var1 >= 104 || var2 >= 104) { + return UrlRequest.Client_plane; + } + + if ((Tiles.Tiles_renderFlags[UrlRequest.Client_plane][var3][var4] & 4) != 0) { + var0 = UrlRequest.Client_plane; + } + + int var5; + if (var1 > var3) { + var5 = var1 - var3; + } else { + var5 = var3 - var1; + } + + int var6; + if (var2 > var4) { + var6 = var2 - var4; + } else { + var6 = var4 - var2; + } + + int var7; + int var8; + if (var5 > var6) { + var7 = var6 * 65536 / var5; + var8 = 32768; + + while (var3 != var1) { + if (var3 < var1) { + ++var3; + } else if (var3 > var1) { + --var3; + } + + if ((Tiles.Tiles_renderFlags[UrlRequest.Client_plane][var3][var4] & 4) != 0) { + var0 = UrlRequest.Client_plane; + } + + var8 += var7; + if (var8 >= 65536) { + var8 -= 65536; + if (var4 < var2) { + ++var4; + } else if (var4 > var2) { + --var4; + } + + if ((Tiles.Tiles_renderFlags[UrlRequest.Client_plane][var3][var4] & 4) != 0) { + var0 = UrlRequest.Client_plane; + } + } + } + } else if (var6 > 0) { + var7 = var5 * 65536 / var6; + var8 = 32768; + + while (var4 != var2) { + if (var4 < var2) { + ++var4; + } else if (var4 > var2) { + --var4; + } + + if ((Tiles.Tiles_renderFlags[UrlRequest.Client_plane][var3][var4] & 4) != 0) { + var0 = UrlRequest.Client_plane; + } + + var8 += var7; + if (var8 >= 65536) { + var8 -= 65536; + if (var3 < var1) { + ++var3; + } else if (var3 > var1) { + --var3; + } + + if ((Tiles.Tiles_renderFlags[UrlRequest.Client_plane][var3][var4] & 4) != 0) { + var0 = UrlRequest.Client_plane; + } + } + } + } } - if (var3 == 2) { - var0.field971 = 0; + if (Message.localPlayer.x >= 0 && Message.localPlayer.y >= 0 && Message.localPlayer.x < 13312 && Message.localPlayer.y < 13312) { + if ((Tiles.Tiles_renderFlags[UrlRequest.Client_plane][Message.localPlayer.x >> 7][Message.localPlayer.y >> 7] & 4) != 0) { + var0 = UrlRequest.Client_plane; + } + + return var0; + } else { + return UrlRequest.Client_plane; + } + } + } + + @ObfuscatedName("hi") + @ObfuscatedSignature( + signature = "(ZLkl;I)V", + garbageValue = "-1139721015" + ) + @Export("updateNpcs") + static final void updateNpcs(boolean var0, PacketBuffer var1) { + Client.field815 = 0; + Client.field673 = 0; + HitSplatDefinition.method4612(); + GrandExchangeOfferWorldComparator.method71(var0, var1); + class65.method1228(var1); + + int var2; + for (var2 = 0; var2 < Client.field815; ++var2) { + int var3 = Client.field745[var2]; + if (Client.npcs[var3].npcCycle != Client.cycle) { + Client.npcs[var3].definition = null; + Client.npcs[var3] = null; } - } else if (var1 == -1 || var0.sequence == -1 || GrandExchangeOfferAgeComparator.SequenceDefinition_get(var1).field3527 >= GrandExchangeOfferAgeComparator.SequenceDefinition_get(var0.sequence).field3527) { - var0.sequence = var1; - var0.sequenceFrame = 0; - var0.sequenceFrameCycle = 0; - var0.sequenceDelay = var2; - var0.field971 = 0; - var0.field994 = var0.pathLength; } + 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("io") + @ObfuscatedSignature( + signature = "(IIS)V", + garbageValue = "-26305" + ) + @Export("resumePauseWidget") + static void resumePauseWidget(int var0, int var1) { + PacketBufferNode var2 = class2.getPacketBufferNode(ClientPacket.field2246, Client.packetWriter.isaacCipher); + var2.packetBuffer.writeInt(var0); + var2.packetBuffer.method5746(var1); + Client.packetWriter.addNode(var2); } } diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index 9f89e1cc0a..47d52fbd5d 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -1,4 +1,6 @@ +import java.io.File; import java.io.IOException; +import java.io.RandomAccessFile; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -11,67 +13,55 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ai") +@ObfuscatedName("as") @Implements("WorldMapRegion") public class WorldMapRegion { - @ObfuscatedName("sx") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Llo;" - ) - @Export("worldMap") - static WorldMap worldMap; - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "Leo;" + signature = "Lfe;" ) @Export("WorldMapRegion_cachedSprites") public static DemotingHashTable WorldMapRegion_cachedSprites; - @ObfuscatedName("da") - @ObfuscatedSignature( - signature = "Lij;" - ) - @Export("archive8") - static Archive archive8; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1644673379 + intValue = -1375036887 ) @Export("regionX") int regionX; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 155602153 + intValue = 1046641901 ) @Export("regionY") int regionY; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lr;" + signature = "Ll;" ) @Export("worldMapData_0") WorldMapData_0 worldMapData_0; - @ObfuscatedName("w") + @ObfuscatedName("a") @Export("worldMapData1List") LinkedList worldMapData1List; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1389068533 + intValue = -1010803547 ) @Export("backgroundColor") int backgroundColor; - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -342949877 + intValue = -401497597 ) @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("x") + @ObfuscatedName("o") @Export("icon0List") List icon0List; - @ObfuscatedName("o") + @ObfuscatedName("v") @Export("iconMap") HashMap iconMap; - @ObfuscatedName("e") + @ObfuscatedName("k") @Export("fonts") final HashMap fonts; @@ -89,18 +79,13 @@ public class WorldMapRegion { this.fonts = var4; } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(IIII)V", - garbageValue = "-684564280" + signature = "(IIIB)V", + garbageValue = "-29" ) - void method460(int var1, int var2, int var3) { - int var5 = this.regionX; - int var6 = this.regionY; - int var7 = this.pixelsPerTile; - DemotingHashTable var8 = WorldMapRegion_cachedSprites; - long var9 = (long)(var7 << 16 | var5 << 8 | var6); - Sprite var4 = (Sprite)var8.get(var9); + void method417(int var1, int var2, int var3) { + Sprite var4 = WorldMapArea.method381(this.regionX, this.regionY, this.pixelsPerTile); if (var4 != null) { if (var3 == this.pixelsPerTile * 64) { var4.drawAt(var1, var2); @@ -111,10 +96,10 @@ public class WorldMapRegion { } } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lr;Ljava/util/List;I)V", - garbageValue = "-1835968904" + signature = "(Ll;Ljava/util/List;B)V", + garbageValue = "14" ) @Export("initWorldMapData0") void initWorldMapData0(WorldMapData_0 var1, List var2) { @@ -123,10 +108,10 @@ public class WorldMapRegion { this.addAllToIconList(var2); } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Ljava/util/HashSet;Ljava/util/List;B)V", - garbageValue = "4" + signature = "(Ljava/util/HashSet;Ljava/util/List;I)V", + garbageValue = "-203983545" ) @Export("initWorldMapData1") void initWorldMapData1(HashSet var1, List var2) { @@ -143,15 +128,15 @@ public class WorldMapRegion { this.addAllToIconList(var2); } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(IIIILm;I)V", - garbageValue = "-1966744518" + signature = "(IIIILh;I)V", + garbageValue = "-860745153" ) @Export("getIconsForTiles") void getIconsForTiles(int var1, int var2, int var3, int var4, AbstractWorldMapData var5) { for (int var6 = var1; var6 < var3 + var1; ++var6) { - label75: + label51: for (int var7 = var2; var7 < var2 + var4; ++var7) { for (int var8 = 0; var8 < var5.planes; ++var8) { WorldMapDecoration[] var9 = var5.decorations[var8][var6][var7]; @@ -159,33 +144,11 @@ public class WorldMapRegion { WorldMapDecoration[] var10 = var9; for (int var11 = 0; var11 < var10.length; ++var11) { - ObjectDefinition var13; - boolean var14; - label66: { - WorldMapDecoration var12 = var10[var11]; - var13 = Occluder.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 = Occluder.getObjectDefinition(var17); - if (var18.mapIconId != -1) { - var14 = true; - break label66; - } - } - } else if (var13.mapIconId != -1) { - var14 = true; - break label66; - } - - var14 = false; - } - - if (var14) { + WorldMapDecoration var12 = var10[var11]; + ObjectDefinition var13 = Coord.getObjectDefinition(var12.objectDefinitionId); + if (FontName.method5377(var13)) { this.getIcon(var13, var8, var6, var7, var5); - continue label75; + continue label51; } } } @@ -195,10 +158,10 @@ public class WorldMapRegion { } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Lil;IIILm;I)V", - garbageValue = "-1396744194" + signature = "(Lig;IIILh;I)V", + garbageValue = "-992347084" ) @Export("getIcon") void getIcon(ObjectDefinition var1, int var2, int var3, int var4, AbstractWorldMapData var5) { @@ -208,24 +171,24 @@ public class WorldMapRegion { var7 = new Coord(this.worldMapData_0.minPlane + var2, var3 + this.worldMapData_0.regionXLow * 4096, var4 + this.worldMapData_0.regionYLow * 64); } else { WorldMapData_1 var8 = (WorldMapData_1)var5; - var7 = new Coord(var2 + var8.minPlane, var3 + var8.regionXLow * 4096 + var8.getChunkXLow() * 8, var4 + var8.regionYLow * 64 + var8.getChunkYLow() * 8); + var7 = new Coord(var2 + var8.minPlane, var8.regionXLow * 4096 + var3 + var8.getChunkXLow() * 8, var4 + var8.regionYLow * 64 + var8.getChunkYLow() * 8); } Object var10; if (var1.transforms != null) { var10 = new WorldMapIcon_1(var7, var6, var1.id, this); } else { - WorldMapElement var9 = Varcs.WorldMapElement_get(var1.mapIconId); + WorldMapElement var9 = GrandExchangeOfferUnitPriceComparator.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("y") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1299616517" + garbageValue = "-128030675" ) @Export("initWorldMapIcon1s") void initWorldMapIcon1s() { @@ -240,10 +203,10 @@ public class WorldMapRegion { } - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( signature = "(Ljava/util/List;I)V", - garbageValue = "-679191042" + garbageValue = "1280170698" ) @Export("addAllToIconList") void addAllToIconList(List var1) { @@ -252,19 +215,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.method465(var3.element)); + WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method445(var3.element)); this.icon0List.add(var4); } } } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "18" + signature = "(S)V", + garbageValue = "29290" ) - void method443() { + void method424() { if (this.worldMapData_0 != null) { this.worldMapData_0.reset(); } else { @@ -278,10 +241,10 @@ public class WorldMapRegion { } - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lhf;I)Z", - garbageValue = "-1443826552" + signature = "(Lhz;B)Z", + garbageValue = "8" ) @Export("loadGeography") boolean loadGeography(AbstractArchive var1) { @@ -317,61 +280,50 @@ public class WorldMapRegion { } } - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(ILaz;[Llm;Lhf;Lhf;S)V", - garbageValue = "2800" + signature = "(ILac;[Lli;Lhz;Lhz;I)V", + garbageValue = "907616954" ) @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()) { - int var7 = this.regionX; - int var8 = this.regionY; - DemotingHashTable var9 = WorldMapRegion_cachedSprites; - long var10 = (long)(var1 << 16 | var7 << 8 | var8); - Sprite var6 = (Sprite)var9.get(var10); - if (var6 == null) { - boolean var15 = true; - var15 &= this.loadGeography(var4); - int var11; + if (WorldMapArea.method381(this.regionX, this.regionY, var1) == null) { + boolean var6 = true; + var6 &= this.loadGeography(var4); + int var8; if (this.worldMapData_0 != null) { - var11 = this.worldMapData_0.groupId; + var8 = this.worldMapData_0.groupId; } else { - var11 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; + var8 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; } - var15 &= var5.tryLoadGroup(var11); - if (var15) { - byte[] var16 = var5.takeFileFlat(var11); - WorldMapSprite var12; - if (var16 == null) { - var12 = new WorldMapSprite(); - } else { - var12 = new WorldMapSprite(MouseHandler.convertJpgToSprite(var16).pixels); - } - - Sprite var14 = new Sprite(this.pixelsPerTile * 64, this.pixelsPerTile * 64); - var14.setRaster(); + var6 &= var5.tryLoadGroup(var8); + if (var6) { + byte[] var7 = var5.takeFileFlat(var8); + WorldMapSprite var9 = WorldMapDecoration.method325(var7); + Sprite var10 = new Sprite(this.pixelsPerTile * 64, this.pixelsPerTile * 64); + var10.setRaster(); if (this.worldMapData_0 != null) { - this.method454(var2, var3, var12); + this.method475(var2, var3, var9); } else { - this.method449(var2, var3, var12); + this.method430(var2, var3, var9); } - class43.method822(var14, this.regionX, this.regionY, this.pixelsPerTile); - this.method443(); + WorldMapData_0.method169(var10, this.regionX, this.regionY, this.pixelsPerTile); + this.method424(); } } } } - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(IIILjava/util/HashSet;I)V", - garbageValue = "-617331188" + signature = "(IIILjava/util/HashSet;B)V", + garbageValue = "91" ) - void method446(int var1, int var2, int var3, HashSet var4) { + void method427(int var1, int var2, int var3, HashSet var4) { if (var4 == null) { var4 = new HashSet(); } @@ -380,10 +332,10 @@ public class WorldMapRegion { this.drawMapLinks(var1, var2, var4, var3); } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Ljava/util/HashSet;IIB)V", - garbageValue = "-80" + signature = "(Ljava/util/HashSet;III)V", + garbageValue = "-575920930" ) @Export("flashElements") void flashElements(HashSet var1, int var2, int var3) { @@ -394,44 +346,44 @@ public class WorldMapRegion { if (var5.hasValidElement()) { int var6 = var5.getElement(); if (var1.contains(var6)) { - WorldMapElement var7 = Varcs.WorldMapElement_get(var6); + WorldMapElement var7 = GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(var6); this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); } } } - this.method457(var1, var2, var3); + this.method436(var1, var2, var3); } - @ObfuscatedName("n") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Laz;[Llm;Lad;I)V", - garbageValue = "-795524086" + signature = "(Lac;[Lli;Lav;B)V", + garbageValue = "121" ) - void method454(class40 var1, IndexedSprite[] var2, WorldMapSprite var3) { + void method475(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.method510(var4, var5, this.worldMapData_0, var1); + this.method435(var4, var5, this.worldMapData_0, var1); } } for (var4 = 0; var4 < 64; ++var4) { for (var5 = 0; var5 < 64; ++var5) { - this.method557(var4, var5, this.worldMapData_0, var1, var2); + this.method457(var4, var5, this.worldMapData_0, var1, var2); } } } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Laz;[Llm;Lad;I)V", - garbageValue = "-847322953" + signature = "(Lac;[Lli;Lav;I)V", + garbageValue = "11820226" ) - void method449(class40 var1, IndexedSprite[] var2, WorldMapSprite var3) { + void method430(class40 var1, IndexedSprite[] var2, WorldMapSprite var3) { Iterator var4 = this.worldMapData1List.iterator(); WorldMapData_1 var5; @@ -443,7 +395,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.method510(var6, var7, var5, var1); + this.method435(var6, var7, var5, var1); } } } @@ -455,27 +407,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.method557(var6, var7, var5, var1, var2); + this.method457(var6, var7, var5, var1, var2); } } } } - @ObfuscatedName("s") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(IILm;Laz;[Llm;S)V", - garbageValue = "23091" + signature = "(IILh;Lac;[Lli;I)V", + garbageValue = "-2005670242" ) - void method557(int var1, int var2, AbstractWorldMapData var3, class40 var4, IndexedSprite[] var5) { - this.method455(var1, var2, var3); - this.method450(var1, var2, var3, var5); + void method457(int var1, int var2, AbstractWorldMapData var3, class40 var4, IndexedSprite[] var5) { + this.method451(var1, var2, var3); + this.method434(var1, var2, var3, var5); } - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(IILm;Laz;Lad;I)V", - garbageValue = "1713363945" + signature = "(IILh;Lac;Lav;I)V", + garbageValue = "-1238267730" ) @Export("drawTileGround") void drawTileGround(int var1, int var2, AbstractWorldMapData var3, class40 var4, WorldMapSprite var5) { @@ -487,56 +439,56 @@ public class WorldMapRegion { int var8 = 16711935; if (var7 != -1) { - var8 = class288.method5383(var7, this.backgroundColor); + var8 = Language.method3627(var7, this.backgroundColor); } - if (var7 > -1 && var3.field166[0][var1][var2] == 0) { + if (var7 > -1 && var3.field150[0][var1][var2] == 0) { Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); } else { - int var9 = this.method453(var1, var2, var3, var5); + int var9 = this.method433(var1, var2, var3, var5); if (var7 == -1) { Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); } else { - var4.method740(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field166[0][var1][var2], var3.field160[0][var1][var2]); + var4.method736(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field150[0][var1][var2], var3.field149[0][var1][var2]); } } } - @ObfuscatedName("m") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(IILm;Laz;I)V", - garbageValue = "-1210019678" + signature = "(IILh;Lac;I)V", + garbageValue = "-1735440961" ) - void method510(int var1, int var2, AbstractWorldMapData var3, class40 var4) { + void method435(int var1, int var2, AbstractWorldMapData var3, class40 var4) { for (int var5 = 1; var5 < var3.planes; ++var5) { int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; if (var6 > -1) { - int var7 = class288.method5383(var6, this.backgroundColor); - if (var3.field166[var5][var1][var2] == 0) { + int var7 = Language.method3627(var6, this.backgroundColor); + if (var3.field150[var5][var1][var2] == 0) { Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); } else { - var4.method740(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field166[var5][var1][var2], var3.field160[var5][var1][var2]); + var4.method736(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field150[var5][var1][var2], var3.field149[var5][var1][var2]); } } } } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IILm;Lad;B)I", - garbageValue = "-55" + signature = "(IILh;Lav;I)I", + garbageValue = "-1005034743" ) - int method453(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { + int method433(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); } - @ObfuscatedName("q") + @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "(IILm;[Llm;I)V", - garbageValue = "-179738925" + signature = "(IILh;[Lli;I)V", + garbageValue = "843307323" ) - void method450(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { + void method434(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) { @@ -545,15 +497,21 @@ public class WorldMapRegion { for (int var8 = 0; var8 < var7.length; ++var8) { WorldMapDecoration var9 = var7[var8]; int var11 = var9.decoration; - boolean var10 = var11 >= WorldMapDecorationType.field2747.id && var11 <= WorldMapDecorationType.field2728.id; - if (var10 || class195.method3743(var9.decoration)) { - ObjectDefinition var12 = Occluder.getObjectDefinition(var9.objectDefinitionId); - if (var12.mapSceneId != -1) { - if (var12.mapSceneId != 46 && var12.mapSceneId != 52) { - var4[var12.mapSceneId].method6182(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); - } else { - var4[var12.mapSceneId].method6182(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); - } + boolean var10 = var11 >= WorldMapDecorationType.field2725.id && var11 <= WorldMapDecorationType.field2726.id; + if (!var10) { + int var13 = var9.decoration; + boolean var12 = var13 == WorldMapDecorationType.field2727.id; + if (!var12) { + continue; + } + } + + ObjectDefinition var14 = Coord.getObjectDefinition(var9.objectDefinitionId); + if (var14.mapSceneId != -1) { + if (var14.mapSceneId != 46 && var14.mapSceneId != 52) { + var4[var14.mapSceneId].method6124(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); + } else { + var4[var14.mapSceneId].method6124(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); } } } @@ -562,12 +520,12 @@ public class WorldMapRegion { } - @ObfuscatedName("l") + @ObfuscatedName("av") @ObfuscatedSignature( - signature = "(IILm;B)V", - garbageValue = "56" + signature = "(IILh;I)V", + garbageValue = "-2096863892" ) - void method455(int var1, int var2, AbstractWorldMapData var3) { + void method451(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) { @@ -575,25 +533,25 @@ public class WorldMapRegion { for (int var7 = 0; var7 < var6.length; ++var7) { WorldMapDecoration var8 = var6[var7]; - if (class81.method2086(var8.decoration)) { - ObjectDefinition var9 = Occluder.getObjectDefinition(var8.objectDefinitionId); + if (Messages.method2240(var8.decoration)) { + ObjectDefinition var9 = Coord.getObjectDefinition(var8.objectDefinitionId); int var10 = var9.int1 != 0 ? -3407872 : -3355444; - if (var8.decoration == WorldMapDecorationType.field2748.id) { - this.method469(var1, var2, var8.rotation, var10); + if (var8.decoration == WorldMapDecorationType.field2719.id) { + this.method449(var1, var2, var8.rotation, var10); } - if (var8.decoration == WorldMapDecorationType.field2727.id) { - this.method469(var1, var2, var8.rotation, -3355444); - this.method469(var1, var2, var8.rotation + 1, var10); + if (var8.decoration == WorldMapDecorationType.field2710.id) { + this.method449(var1, var2, var8.rotation, -3355444); + this.method449(var1, var2, var8.rotation + 1, var10); } - if (var8.decoration == WorldMapDecorationType.field2730.id) { + if (var8.decoration == WorldMapDecorationType.field2708.id) { if (var8.rotation == 0) { Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var10); } if (var8.rotation == 1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2), 1, var10); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var10); } if (var8.rotation == 2) { @@ -605,7 +563,7 @@ public class WorldMapRegion { } } - if (var8.decoration == WorldMapDecorationType.field2731.id) { + if (var8.decoration == WorldMapDecorationType.field2707.id) { int var11 = var8.rotation % 2; int var12; if (var11 == 0) { @@ -625,10 +583,10 @@ public class WorldMapRegion { } - @ObfuscatedName("j") + @ObfuscatedName("aw") @ObfuscatedSignature( signature = "(IILjava/util/HashSet;II)V", - garbageValue = "-2128075696" + garbageValue = "-1722827665" ) @Export("drawNonLinkMapIcons") void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) { @@ -640,32 +598,32 @@ public class WorldMapRegion { Entry var8 = (Entry)var7.next(); Coord var9 = (Coord)var8.getKey(); int var10 = (int)((float)var1 + (float)var9.x * var5 - var6); - int var11 = (int)((float)(var2 + var4) - (float)var9.y * 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 = Varcs.WorldMapElement_get(var12.getElement()); + WorldMapElement var13 = GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(var12.getElement()); if (!var3.contains(var13.getObjectId())) { - this.method459(var12, var10, var11, var5); + this.method439(var12, var10, var11, var5); } } } } - @ObfuscatedName("ad") + @ObfuscatedName("as") @ObfuscatedSignature( signature = "(Ljava/util/HashSet;III)V", - garbageValue = "693286159" + garbageValue = "-750214661" ) - void method457(HashSet var1, int var2, int var3) { + void method436(HashSet var1, int var2, int var3) { Iterator var4 = this.icon0List.iterator(); while (var4.hasNext()) { AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); if (var5.hasValidElement()) { - WorldMapElement var6 = Varcs.WorldMapElement_get(var5.getElement()); + WorldMapElement var6 = GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(var5.getElement()); if (var6 != null && var1.contains(var6.getObjectId())) { this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); } @@ -674,10 +632,10 @@ public class WorldMapRegion { } - @ObfuscatedName("am") + @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "(Lis;IIIIB)V", - garbageValue = "57" + signature = "(Lit;IIIII)V", + garbageValue = "1151123929" ) @Export("drawBackgroundCircle") void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, int var5) { @@ -692,51 +650,51 @@ public class WorldMapRegion { } } - @ObfuscatedName("ai") + @ObfuscatedName("au") @ObfuscatedSignature( - signature = "(Laa;IIFI)V", - garbageValue = "1357516657" + signature = "(Lao;IIFB)V", + garbageValue = "22" ) - void method459(AbstractWorldMapIcon var1, int var2, int var3, float var4) { - WorldMapElement var5 = Varcs.WorldMapElement_get(var1.getElement()); - this.method535(var5, var2, var3); - this.method461(var1, var5, var2, var3, var4); + void method439(AbstractWorldMapIcon var1, int var2, int var3, float var4) { + WorldMapElement var5 = GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(var1.getElement()); + this.method440(var5, var2, var3); + this.method507(var1, var5, var2, var3, var4); } - @ObfuscatedName("ag") + @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "(Lis;III)V", - garbageValue = "-682100464" + signature = "(Lit;III)V", + garbageValue = "-1270354763" ) - void method535(WorldMapElement var1, int var2, int var3) { + void method440(WorldMapElement var1, int var2, int var3) { Sprite var4 = var1.getSpriteBool(false); if (var4 != null) { - int var5 = this.method463(var4, var1.horizontalAlignment); - int var6 = this.method464(var4, var1.verticalAlignment); + int var5 = this.method443(var4, var1.horizontalAlignment); + int var6 = this.method444(var4, var1.verticalAlignment); var4.drawTransBgAt(var5 + var2, var3 + var6); } } - @ObfuscatedName("ao") + @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "(Laa;Lis;IIFI)V", - garbageValue = "-383988054" + signature = "(Lao;Lit;IIFB)V", + garbageValue = "55" ) - void method461(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { + void method507(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { WorldMapLabel var6 = var1.getLabel(); if (var6 != null) { - if (var6.size.method199(var5)) { + if (var6.size.method183(var5)) { Font var7 = (Font)this.fonts.get(var6.size); - var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field3227, 0, 1, 0, var7.ascent / 2); + var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field3195, 0, 1, 0, var7.ascent / 2); } } } - @ObfuscatedName("aw") + @ObfuscatedName("ao") @ObfuscatedSignature( signature = "(IILjava/util/HashSet;II)V", - garbageValue = "-1649887990" + garbageValue = "-1968496200" ) @Export("drawMapLinks") void drawMapLinks(int var1, int var2, HashSet var3, int var4) { @@ -748,24 +706,24 @@ public class WorldMapRegion { if (var7.hasValidElement()) { int var8 = var7.coord2.x % 64; int var9 = var7.coord2.y % 64; - var7.screenX = (int)(var5 * (float)var8 + (float)var1); - var7.screenY = (int)((float)(63 - var9) * var5 + (float)var2); + var7.screenX = (int)((float)var8 * var5 + (float)var1); + var7.screenY = (int)(var5 * (float)(63 - var9) + (float)var2); if (!var3.contains(var7.getElement())) { - this.method459(var7, var7.screenX, var7.screenY, var5); + this.method439(var7, var7.screenX, var7.screenY, var5); } } } } - @ObfuscatedName("ak") + @ObfuscatedName("an") @ObfuscatedSignature( - signature = "(Lln;Lip;B)I", - garbageValue = "14" + signature = "(Lls;Liz;B)I", + garbageValue = "43" ) - int method463(Sprite var1, HorizontalAlignment var2) { + int method443(Sprite var1, HorizontalAlignment var2) { switch(var2.value) { - case 1: + case 0: return 0; case 2: return -var1.subWidth / 2; @@ -774,41 +732,41 @@ public class WorldMapRegion { } } - @ObfuscatedName("aa") + @ObfuscatedName("ar") @ObfuscatedSignature( - signature = "(Lln;Lik;B)I", - garbageValue = "68" + signature = "(Lls;Lia;I)I", + garbageValue = "1222469421" ) - int method464(Sprite var1, VerticalAlignment var2) { + int method444(Sprite var1, VerticalAlignment var2) { switch(var2.value) { + case 0: + return 0; case 1: return -var1.subHeight / 2; - case 2: - return 0; default: return -var1.subHeight; } } - @ObfuscatedName("ab") + @ObfuscatedName("ay") @ObfuscatedSignature( - signature = "(II)Lam;", - garbageValue = "1821689800" + signature = "(II)Law;", + garbageValue = "-1275303691" ) - WorldMapLabel method465(int var1) { - WorldMapElement var2 = Varcs.WorldMapElement_get(var1); + WorldMapLabel method445(int var1) { + WorldMapElement var2 = GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(var1); return this.createMapLabel(var2); } - @ObfuscatedName("ar") + @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "(Lis;I)Lam;", - garbageValue = "1746984480" + signature = "(Lit;B)Law;", + garbageValue = "87" ) @Export("createMapLabel") WorldMapLabel createMapLabel(WorldMapElement var1) { if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { - WorldMapLabelSize var2 = WorldMapLabelSize.method209(var1.textSize); + WorldMapLabelSize var2 = WorldMapLabelSize.method182(var1.textSize); if (var2 == null) { return null; } else { @@ -839,12 +797,12 @@ public class WorldMapRegion { } } - @ObfuscatedName("av") + @ObfuscatedName("ac") @ObfuscatedSignature( signature = "(IIIIII)Ljava/util/List;", - garbageValue = "-950431739" + garbageValue = "-1417348490" ) - List method467(int var1, int var2, int var3, int var4, int var5) { + List method498(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) { @@ -876,10 +834,10 @@ public class WorldMapRegion { } } - @ObfuscatedName("aq") + @ObfuscatedName("al") @ObfuscatedSignature( signature = "(I)Ljava/util/List;", - garbageValue = "-907071447" + garbageValue = "-989883641" ) @Export("icons") List icons() { @@ -889,12 +847,12 @@ public class WorldMapRegion { return var1; } - @ObfuscatedName("ac") + @ObfuscatedName("ae") @ObfuscatedSignature( signature = "(IIIII)V", - garbageValue = "-1544292788" + garbageValue = "899248185" ) - void method469(int var1, int var2, int var3, int var4) { + void method449(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); @@ -914,287 +872,646 @@ public class WorldMapRegion { } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(II)Lir;", - garbageValue = "1453408926" + signature = "(Ljava/lang/String;Ljava/lang/String;IIS)V", + garbageValue = "-3328" ) - @Export("SpotAnimationDefinition_get") - public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) { - SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); - var1 = new SpotAnimationDefinition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } + public static void method504(String var0, String var1, int var2, int var3) throws IOException { + JagexCache.idxCount = var3; + VertexNormal.cacheGamebuild = var2; - SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); - return var1; + try { + StudioGame.field3092 = System.getProperty("os.name"); + } catch (Exception var14) { + StudioGame.field3092 = "Unknown"; } - } - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(Lhf;Lhf;ZII)V", - garbageValue = "347974889" - ) - static void method505(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { - if (Login.field1194) { - if (var3 == 4) { - Login.loginIndex = 4; + class81.field1129 = StudioGame.field3092.toLowerCase(); + + try { + ReflectionCheck.userHomeDirectory = System.getProperty("user.home"); + if (ReflectionCheck.userHomeDirectory != null) { + ReflectionCheck.userHomeDirectory = ReflectionCheck.userHomeDirectory + "/"; } + } catch (Exception var13) { + } - } else { - Login.loginIndex = var3; - Rasterizer2D.Rasterizer2D_clear(); - byte[] var4 = var0.takeFileByNames("title.jpg", ""); - AbstractByteArrayCopier.leftTitleSprite = MouseHandler.convertJpgToSprite(var4); - class319.rightTitleSprite = AbstractByteArrayCopier.leftTitleSprite.mirrorHorizontally(); - if ((Client.worldProperties & 536870912) != 0) { - Decimator.logoSprite = BZip2State.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); - } else if ((Client.worldProperties & 1073741824) != 0) { - Decimator.logoSprite = BZip2State.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); - } else { - Decimator.logoSprite = BZip2State.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); - } - - Login.titleboxSprite = BZip2State.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); - Login.titlebuttonSprite = BZip2State.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); - int var6 = var1.getGroupId("runes"); - int var7 = var1.getFileId(var6, ""); - IndexedSprite[] var8; - if (!GraphicsObject.method2030(var1, var6, var7)) { - var8 = null; - } else { - var8 = WallDecoration.method3341(); - } - - StructDefinition.runesSprite = var8; - var7 = var1.getGroupId("title_mute"); - int var10 = var1.getFileId(var7, ""); - IndexedSprite[] var9; - if (!GraphicsObject.method2030(var1, var7, var10)) { - var9 = null; - } else { - var9 = WallDecoration.method3341(); - } - - Login.title_muteSprite = var9; - InterfaceParent.options_buttons_0Sprite = BZip2State.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); - Login.field1179 = BZip2State.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); - Varps.options_buttons_2Sprite = BZip2State.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); - StructDefinition.field3315 = BZip2State.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); - HealthBar.field1115 = InterfaceParent.options_buttons_0Sprite.subWidth; - class40.field348 = InterfaceParent.options_buttons_0Sprite.subHeight; - DynamicObject.loginScreenRunesAnimation = new LoginScreenAnimation(StructDefinition.runesSprite); - if (var2) { - Login.Login_username = ""; - Login.Login_password = ""; - } - - class192.field2395 = 0; - WorldMapSection0.otp = ""; - Login.field1196 = true; - Login.worldSelectOpen = false; - if (!UserComparator10.clientPreferences.titleMusicDisabled) { - Archive var12 = AbstractWorldMapData.archive6; - var10 = var12.getGroupId("scape main"); - int var13 = var12.getFileId(var10, ""); - World.method1819(2, var12, var10, var13, 255, false); - } else { - UrlRequest.method3358(2); - } - - if (NetCache.NetCache_socket != null) { - try { - Buffer var16 = new Buffer(4); - var16.writeByte(3); - var16.writeMedium(0); - NetCache.NetCache_socket.write(var16.array, 0, 4); - } catch (IOException var15) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var14) { - } - - ++NetCache.NetCache_ioExceptions; - NetCache.NetCache_socket = null; + try { + if (class81.field1129.startsWith("win")) { + if (ReflectionCheck.userHomeDirectory == null) { + ReflectionCheck.userHomeDirectory = System.getenv("USERPROFILE"); } + } else if (ReflectionCheck.userHomeDirectory == null) { + ReflectionCheck.userHomeDirectory = System.getenv("HOME"); } - Login.field1194 = true; - Login.xPadding = (BoundaryObject.canvasWidth - 765) / 2; - Login.loginBoxX = Login.xPadding + 202; - GrandExchangeOfferOwnWorldComparator.loginBoxCenter = Login.loginBoxX + 180; - AbstractByteArrayCopier.leftTitleSprite.drawAt(Login.xPadding, 0); - class319.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - Decimator.logoSprite.drawAt(Login.xPadding + 382 - Decimator.logoSprite.subWidth / 2, 18); + if (ReflectionCheck.userHomeDirectory != null) { + ReflectionCheck.userHomeDirectory = ReflectionCheck.userHomeDirectory + "/"; + } + } catch (Exception var12) { } - } - @ObfuscatedName("hg") - @ObfuscatedSignature( - signature = "(ZLkj;B)V", - garbageValue = "0" - ) - @Export("loadRegions") - static final void loadRegions(boolean var0, PacketBuffer var1) { - Client.isInInstance = var0; - int var2; - int var4; - int var5; - int var6; + if (ReflectionCheck.userHomeDirectory == null) { + ReflectionCheck.userHomeDirectory = "~/"; + } + + JagexCache.field2024 = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", ReflectionCheck.userHomeDirectory, "/tmp/", ""}; + WorldMapSprite.field219 = new String[]{".jagex_cache_" + VertexNormal.cacheGamebuild, ".file_store_" + VertexNormal.cacheGamebuild}; + int var9 = 0; + int var7; - int var8; - if (!Client.isInInstance) { - var2 = var1.method5640(); - int var3 = var1.method5641(); - var4 = var1.readUnsignedShort(); - WorldMapIcon_0.xteaKeys = new int[var4][4]; + File var8; + label132: + while (var9 < 4) { + JagexCache.cacheDir = class81.method2064(var0, var1, var9); + if (!JagexCache.cacheDir.exists()) { + JagexCache.cacheDir.mkdirs(); + } - for (var5 = 0; var5 < var4; ++var5) { - for (var6 = 0; var6 < 4; ++var6) { - WorldMapIcon_0.xteaKeys[var5][var6] = var1.readInt(); + File[] var5 = JagexCache.cacheDir.listFiles(); + if (var5 == null) { + break; + } + + File[] var6 = var5; + var7 = 0; + + while (true) { + if (var7 >= var6.length) { + break label132; } - } - class226.regions = new int[var4]; - BuddyRankComparator.regionMapArchiveIds = new int[var4]; - GrandExchangeOfferAgeComparator.regionLandArchiveIds = new int[var4]; - VerticalAlignment.regionLandArchives = new byte[var4][]; - UrlRequest.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)) { - class226.regions[var4] = var8; - BuddyRankComparator.regionMapArchiveIds[var4] = DirectByteArrayCopier.archive5.getGroupId("m" + var6 + "_" + var7); - GrandExchangeOfferAgeComparator.regionLandArchiveIds[var4] = DirectByteArrayCopier.archive5.getGroupId("l" + var6 + "_" + var7); - ++var4; - } + var8 = var6[var7]; + if (!class173.method3561(var8, false)) { + ++var9; + break; } + + ++var7; } - - WorldMapSection0.method259(var3, var2, true); - } else { - var2 = var1.method5719(); - boolean var15 = var1.method5631() == 1; - var4 = var1.method5719(); - 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(); - WorldMapIcon_0.xteaKeys = new int[var5][4]; - - for (var6 = 0; var6 < var5; ++var6) { - for (var7 = 0; var7 < 4; ++var7) { - WorldMapIcon_0.xteaKeys[var6][var7] = var1.readInt(); - } - } - - class226.regions = new int[var5]; - BuddyRankComparator.regionMapArchiveIds = new int[var5]; - GrandExchangeOfferAgeComparator.regionLandArchiveIds = new int[var5]; - VerticalAlignment.regionLandArchives = new byte[var5][]; - UrlRequest.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 (class226.regions[var13] == var12) { - var12 = -1; - break; - } - } - - if (var12 != -1) { - class226.regions[var5] = var12; - var13 = var12 >> 8 & 255; - int var14 = var12 & 255; - BuddyRankComparator.regionMapArchiveIds[var5] = DirectByteArrayCopier.archive5.getGroupId("m" + var13 + "_" + var14); - GrandExchangeOfferAgeComparator.regionLandArchiveIds[var5] = DirectByteArrayCopier.archive5.getGroupId("l" + var13 + "_" + var14); - ++var5; - } - } - } - } - } - - WorldMapSection0.method259(var4, var2, !var15); } + File var4 = JagexCache.cacheDir; + GrandExchangeOfferNameComparator.FileSystem_cacheDir = var4; + if (!GrandExchangeOfferNameComparator.FileSystem_cacheDir.exists()) { + throw new RuntimeException(""); + } else { + FileSystem.FileSystem_hasPermissions = true; + + try { + File var16 = new File(ReflectionCheck.userHomeDirectory, "random.dat"); + if (var16.exists()) { + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var16, "rw", 25L), 24, 0); + } else { + label112: + for (int var10 = 0; var10 < WorldMapSprite.field219.length; ++var10) { + for (var7 = 0; var7 < JagexCache.field2024.length; ++var7) { + var8 = new File(JagexCache.field2024[var7] + WorldMapSprite.field219[var10] + File.separatorChar + "random.dat"); + if (var8.exists()) { + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var8, "rw", 25L), 24, 0); + break label112; + } + } + } + } + + if (JagexCache.JagexCache_randomDat == null) { + RandomAccessFile var17 = new RandomAccessFile(var16, "rw"); + var7 = var17.read(); + var17.seek(0L); + var17.write(var7); + var17.seek(0L); + var17.close(); + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var16, "rw", 25L), 24, 0); + } + } catch (IOException var15) { + } + + JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(Message.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); + JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(Message.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); + AttackOption.JagexCache_idxFiles = new BufferedFile[JagexCache.idxCount]; + + for (int var11 = 0; var11 < JagexCache.idxCount; ++var11) { + AttackOption.JagexCache_idxFiles[var11] = new BufferedFile(new AccessFile(Message.getFile("main_file_cache.idx" + var11), "rw", 1048576L), 6000, 0); + } + + } } - @ObfuscatedName("jp") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lhl;Liu;IIZI)V", - garbageValue = "-1451067375" + signature = "(B)V", + garbageValue = "5" ) - @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; + static final void method446() { + Tiles.method1143("Your friend list is full. Max of 200 for free users, and 400 for members"); + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(III)I", + garbageValue = "65535" + ) + static final int method536(int var0, int var1) { + int var2 = var1 * 57 + var0; + var2 ^= var2 << 13; + int var3 = var2 * (var2 * var2 * 15731 + 789221) + 1376312589 & Integer.MAX_VALUE; + return var3 >> 19 & 255; + } + + @ObfuscatedName("fn") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "-106" + ) + @Export("load") + static void load() { + int var0; + if (Client.titleLoadingStage == 0) { + class14.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); + + for (var0 = 0; var0 < 4; ++var0) { + Client.collisionMaps[var0] = new CollisionMap(104, 104); } - var7 = var5[var3]; - } else if (var3 == 4) { - var6 = 37; - var7 = "Drop"; - } + Language.sceneMinimapSprite = new Sprite(512, 512); + Login.Login_loadingText = "Starting game engine..."; + Login.Login_loadingPercent = 5; + Client.titleLoadingStage = 20; + } else if (Client.titleLoadingStage == 20) { + Login.Login_loadingText = "Prepared visibility map"; + Login.Login_loadingPercent = 10; + Client.titleLoadingStage = 30; + } else if (Client.titleLoadingStage == 30) { + ClientPacket.archive0 = class48.newArchive(0, false, true, true); + ItemDefinition.archive1 = class48.newArchive(1, false, true, true); + class2.archive2 = class48.newArchive(2, true, false, true); + WorldMapData_1.archive3 = class48.newArchive(3, false, true, true); + FloorDecoration.archive4 = class48.newArchive(4, false, true, true); + AbstractWorldMapData.archive5 = class48.newArchive(5, true, true, true); + GrandExchangeOfferWorldComparator.archive6 = class48.newArchive(6, true, true, true); + MouseRecorder.archive7 = class48.newArchive(7, false, true, true); + class3.archive8 = class48.newArchive(8, false, true, true); + WorldMapManager.archive9 = class48.newArchive(9, false, true, true); + ServerBuild.archive10 = class48.newArchive(10, false, true, true); + class48.archive11 = class48.newArchive(11, false, true, true); + SoundSystem.archive12 = class48.newArchive(12, false, true, true); + WorldMapSection1.archive13 = class48.newArchive(13, true, false, true); + class117.archive14 = class48.newArchive(14, false, true, true); + GrandExchangeOfferTotalQuantityComparator.archive15 = class48.newArchive(15, false, true, true); + GrandExchangeOfferNameComparator.archive17 = class48.newArchive(17, true, true, true); + AbstractWorldMapData.archive18 = class48.newArchive(18, false, true, true); + MusicPatchNode2.archive19 = class48.newArchive(19, false, true, true); + UserComparator9.archive20 = class48.newArchive(20, false, true, true); + Login.Login_loadingText = "Connecting to update server"; + Login.Login_loadingPercent = 20; + Client.titleLoadingStage = 40; + } else if (Client.titleLoadingStage == 40) { + byte var29 = 0; + var0 = var29 + ClientPacket.archive0.percentage() * 4 / 100; + var0 += ItemDefinition.archive1.percentage() * 4 / 100; + var0 += class2.archive2.percentage() * 2 / 100; + var0 += WorldMapData_1.archive3.percentage() * 2 / 100; + var0 += FloorDecoration.archive4.percentage() * 6 / 100; + var0 += AbstractWorldMapData.archive5.percentage() * 4 / 100; + var0 += GrandExchangeOfferWorldComparator.archive6.percentage() * 2 / 100; + var0 += MouseRecorder.archive7.percentage() * 56 / 100; + var0 += class3.archive8.percentage() * 2 / 100; + var0 += WorldMapManager.archive9.percentage() * 2 / 100; + var0 += ServerBuild.archive10.percentage() * 2 / 100; + var0 += class48.archive11.percentage() * 2 / 100; + var0 += SoundSystem.archive12.percentage() * 2 / 100; + var0 += WorldMapSection1.archive13.percentage() * 2 / 100; + var0 += class117.archive14.percentage() * 2 / 100; + var0 += GrandExchangeOfferTotalQuantityComparator.archive15.percentage() * 2 / 100; + var0 += MusicPatchNode2.archive19.percentage() / 100; + var0 += AbstractWorldMapData.archive18.percentage() / 100; + var0 += UserComparator9.archive20.percentage() / 100; + var0 += GrandExchangeOfferNameComparator.archive17.method4246() && GrandExchangeOfferNameComparator.archive17.isFullyLoaded() ? 1 : 0; + if (var0 != 100) { + if (var0 != 0) { + Login.Login_loadingText = "Checking for updates - " + var0 + "%"; + } - if (var6 != -1 && var7 != null) { - class14.insertMenuItem(var7, class222.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); - } + Login.Login_loadingPercent = 30; + } else { + BufferedSource.method5925(ClientPacket.archive0, "Animations"); + BufferedSource.method5925(ItemDefinition.archive1, "Skeletons"); + BufferedSource.method5925(FloorDecoration.archive4, "Sound FX"); + BufferedSource.method5925(AbstractWorldMapData.archive5, "Maps"); + BufferedSource.method5925(GrandExchangeOfferWorldComparator.archive6, "Music Tracks"); + BufferedSource.method5925(MouseRecorder.archive7, "Models"); + BufferedSource.method5925(class3.archive8, "Sprites"); + BufferedSource.method5925(class48.archive11, "Music Jingles"); + BufferedSource.method5925(class117.archive14, "Music Samples"); + BufferedSource.method5925(GrandExchangeOfferTotalQuantityComparator.archive15, "Music Patches"); + BufferedSource.method5925(MusicPatchNode2.archive19, "World Map"); + BufferedSource.method5925(AbstractWorldMapData.archive18, "World Map Geography"); + BufferedSource.method5925(UserComparator9.archive20, "World Map Ground"); + SecureRandomCallable.spriteIds = new GraphicsDefaults(); + SecureRandomCallable.spriteIds.decode(GrandExchangeOfferNameComparator.archive17); + Login.Login_loadingText = "Loaded update list"; + Login.Login_loadingPercent = 30; + Client.titleLoadingStage = 45; + } + } else { + Archive var2; + Archive var3; + if (Client.titleLoadingStage == 45) { + boolean var27 = !Client.isLowDetail; + DirectByteArrayCopier.field2490 = 22050; + SoundCache.PcmPlayer_stereo = var27; + NPC.field1103 = 2; + MidiPcmStream var26 = new MidiPcmStream(); + var26.method3765(9, 128); + UserComparator6.pcmPlayer0 = WorldMapEvent.method763(GameShell.taskHandler, 0, 22050); + UserComparator6.pcmPlayer0.setStream(var26); + var2 = GrandExchangeOfferTotalQuantityComparator.archive15; + var3 = class117.archive14; + Archive var4 = FloorDecoration.archive4; + class197.musicPatchesArchive = var2; + class197.musicSamplesArchive = var3; + class197.soundEffectsArchive = var4; + GZipDecompressor.midiPcmStream = var26; + NetSocket.pcmPlayer1 = WorldMapEvent.method763(GameShell.taskHandler, 1, 2048); + Tiles.pcmStreamMixer = new PcmStreamMixer(); + NetSocket.pcmPlayer1.setStream(Tiles.pcmStreamMixer); + ClientPreferences.decimator = new Decimator(22050, DirectByteArrayCopier.field2490 * -168449264); + Login.Login_loadingText = "Prepared sound engine"; + Login.Login_loadingPercent = 35; + Client.titleLoadingStage = 50; + class65.WorldMapElement_fonts = new Fonts(class3.archive8, WorldMapSection1.archive13); + } else { + int var17; + if (Client.titleLoadingStage == 50) { + FontName[] var31 = new FontName[]{FontName.FontName_plain11, FontName.FontName_verdana13, FontName.FontName_verdana15, FontName.FontName_verdana11, FontName.FontName_plain12, FontName.FontName_bold12}; + var17 = var31.length; + Fonts var24 = class65.WorldMapElement_fonts; + FontName[] var23 = new FontName[]{FontName.FontName_plain11, FontName.FontName_verdana13, FontName.FontName_verdana15, FontName.FontName_verdana11, FontName.FontName_plain12, FontName.FontName_bold12}; + Client.fontsMap = var24.createMap(var23); + if (Client.fontsMap.size() < var17) { + Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var17 + "%"; + Login.Login_loadingPercent = 40; + } else { + class3.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); + ScriptFrame.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); + GrandExchangeOffer.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); + class42.platformInfo = Client.platformInfoProvider.get(); + Login.Login_loadingText = "Loaded fonts"; + Login.Login_loadingPercent = 40; + Client.titleLoadingStage = 60; + } + } else { + int var18; + Archive var25; + if (Client.titleLoadingStage == 60) { + var25 = ServerBuild.archive10; + var2 = class3.archive8; + var18 = 0; + if (var25.tryLoadFileByNames("title.jpg", "")) { + ++var18; + } + if (var2.tryLoadFileByNames("logo", "")) { + ++var18; + } + + if (var2.tryLoadFileByNames("logo_deadman_mode", "")) { + ++var18; + } + + if (var2.tryLoadFileByNames("logo_seasonal_mode", "")) { + ++var18; + } + + if (var2.tryLoadFileByNames("titlebox", "")) { + ++var18; + } + + if (var2.tryLoadFileByNames("titlebutton", "")) { + ++var18; + } + + if (var2.tryLoadFileByNames("runes", "")) { + ++var18; + } + + if (var2.tryLoadFileByNames("title_mute", "")) { + ++var18; + } + + if (var2.tryLoadFileByNames("options_radio_buttons,0", "")) { + ++var18; + } + + if (var2.tryLoadFileByNames("options_radio_buttons,2", "")) { + ++var18; + } + + if (var2.tryLoadFileByNames("options_radio_buttons,4", "")) { + ++var18; + } + + if (var2.tryLoadFileByNames("options_radio_buttons,6", "")) { + ++var18; + } + + var2.tryLoadFileByNames("sl_back", ""); + var2.tryLoadFileByNames("sl_flags", ""); + var2.tryLoadFileByNames("sl_arrows", ""); + var2.tryLoadFileByNames("sl_stars", ""); + var2.tryLoadFileByNames("sl_button", ""); + byte var33 = 12; + if (var18 < var33) { + Login.Login_loadingText = "Loading title screen - " + var18 * 100 / var33 + "%"; + Login.Login_loadingPercent = 50; + } else { + Login.Login_loadingText = "Loaded title screen"; + Login.Login_loadingPercent = 50; + class195.updateGameState(5); + Client.titleLoadingStage = 70; + } + } else if (Client.titleLoadingStage == 70) { + if (!class2.archive2.isFullyLoaded()) { + Login.Login_loadingText = "Loading config - " + class2.archive2.loadPercent() + "%"; + Login.Login_loadingPercent = 60; + } else { + FillMode.method6117(class2.archive2); + WorldMapDecorationType.method4079(class2.archive2); + Archive var30 = class2.archive2; + var25 = MouseRecorder.archive7; + KitDefinition.KitDefinition_archive = var30; + KitDefinition.KitDefinition_modelsArchive = var25; + GrandExchangeOfferUnitPriceComparator.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); + var2 = class2.archive2; + var3 = MouseRecorder.archive7; + boolean var32 = Client.isLowDetail; + ObjectDefinition.ObjectDefinition_archive = var2; + ObjectDefinition.ObjectDefinition_modelsArchive = var3; + ObjectDefinition.ObjectDefinition_isLowDetail = var32; + Archive var34 = class2.archive2; + Archive var22 = MouseRecorder.archive7; + NPCDefinition.NpcDefinition_archive = var34; + NPCDefinition.NpcDefinition_modelArchive = var22; + Messages.method2227(class2.archive2); + class65.method1232(class2.archive2, MouseRecorder.archive7, Client.isMembersWorld, class3.fontPlain11); + Archive var28 = class2.archive2; + Archive var8 = ClientPacket.archive0; + Archive var9 = ItemDefinition.archive1; + SequenceDefinition.SequenceDefinition_archive = var28; + SequenceDefinition.SequenceDefinition_animationsArchive = var8; + SequenceDefinition.SequenceDefinition_skeletonsArchive = var9; + ClientPacket.method3570(class2.archive2, MouseRecorder.archive7); + Archive var10 = class2.archive2; + VarbitDefinition.VarbitDefinition_archive = var10; + WorldMapID.method545(class2.archive2); + DevicePcmPlayerProvider.method842(WorldMapData_1.archive3, MouseRecorder.archive7, class3.archive8, WorldMapSection1.archive13); + UserComparator10.method3335(class2.archive2); + DirectByteArrayCopier.method3940(class2.archive2); + Archive var11 = class2.archive2; + VarcInt.VarcInt_archive = var11; + Archive var12 = class2.archive2; + ParamDefinition.ParamDefinition_archive = var12; + MilliClock.varcs = new Varcs(); + Archive var13 = class2.archive2; + Archive var14 = class3.archive8; + Archive var15 = WorldMapSection1.archive13; + HitSplatDefinition.HitSplatDefinition_archive = var13; + HitSplatDefinition.field3290 = var14; + class206.HitSplatDefinition_fontsArchive = var15; + UserComparator10.method3336(class2.archive2, class3.archive8); + BuddyRankComparator.method3363(class2.archive2, class3.archive8); + Login.Login_loadingText = "Loaded config"; + Login.Login_loadingPercent = 60; + Client.titleLoadingStage = 80; + } + } else if (Client.titleLoadingStage == 80) { + var0 = 0; + if (GrandExchangeOfferTotalQuantityComparator.compass == null) { + GrandExchangeOfferTotalQuantityComparator.compass = FloorUnderlayDefinition.SpriteBuffer_getSprite(class3.archive8, SecureRandomCallable.spriteIds.compass, 0); + } else { + ++var0; + } + + if (class40.redHintArrowSprite == null) { + class40.redHintArrowSprite = FloorUnderlayDefinition.SpriteBuffer_getSprite(class3.archive8, SecureRandomCallable.spriteIds.field3803, 0); + } else { + ++var0; + } + + IndexedSprite[] var1; + int var6; + IndexedSprite var7; + IndexedSprite[] var21; + if (class162.mapSceneSprites == null) { + var2 = class3.archive8; + var18 = SecureRandomCallable.spriteIds.mapScenes; + if (!HitSplatDefinition.method4586(var2, var18, 0)) { + var1 = null; + } else { + var21 = new IndexedSprite[class325.SpriteBuffer_spriteCount]; + + for (var6 = 0; var6 < class325.SpriteBuffer_spriteCount; ++var6) { + var7 = var21[var6] = new IndexedSprite(); + var7.width = class325.SpriteBuffer_spriteWidth; + var7.height = class325.SpriteBuffer_spriteHeight; + var7.xOffset = class325.SpriteBuffer_xOffsets[var6]; + var7.yOffset = class325.SpriteBuffer_yOffsets[var6]; + var7.subWidth = UserComparator1.SpriteBuffer_spriteWidths[var6]; + var7.subHeight = class325.SpriteBuffer_spriteHeights[var6]; + var7.palette = class268.SpriteBuffer_spritePalette; + var7.pixels = class290.SpriteBuffer_pixels[var6]; + } + + Message.method1223(); + var1 = var21; + } + + class162.mapSceneSprites = var1; + } else { + ++var0; + } + + if (class222.headIconPkSprites == null) { + class222.headIconPkSprites = GrandExchangeOfferNameComparator.SpriteBuffer_getSpriteArray(class3.archive8, SecureRandomCallable.spriteIds.headIconsPk, 0); + } else { + ++var0; + } + + if (GraphicsObject.headIconPrayerSprites == null) { + GraphicsObject.headIconPrayerSprites = GrandExchangeOfferNameComparator.SpriteBuffer_getSpriteArray(class3.archive8, SecureRandomCallable.spriteIds.field3798, 0); + } else { + ++var0; + } + + if (WorldMapData_0.headIconHintSprites == null) { + WorldMapData_0.headIconHintSprites = GrandExchangeOfferNameComparator.SpriteBuffer_getSpriteArray(class3.archive8, SecureRandomCallable.spriteIds.field3807, 0); + } else { + ++var0; + } + + if (Varps.mapMarkerSprites == null) { + Varps.mapMarkerSprites = GrandExchangeOfferNameComparator.SpriteBuffer_getSpriteArray(class3.archive8, SecureRandomCallable.spriteIds.field3804, 0); + } else { + ++var0; + } + + if (ObjectDefinition.crossSprites == null) { + ObjectDefinition.crossSprites = GrandExchangeOfferNameComparator.SpriteBuffer_getSpriteArray(class3.archive8, SecureRandomCallable.spriteIds.field3805, 0); + } else { + ++var0; + } + + if (WorldMapLabel.mapDotSprites == null) { + WorldMapLabel.mapDotSprites = GrandExchangeOfferNameComparator.SpriteBuffer_getSpriteArray(class3.archive8, SecureRandomCallable.spriteIds.field3806, 0); + } else { + ++var0; + } + + if (class60.scrollBarSprites == null) { + var2 = class3.archive8; + var18 = SecureRandomCallable.spriteIds.field3799; + if (!HitSplatDefinition.method4586(var2, var18, 0)) { + var1 = null; + } else { + var21 = new IndexedSprite[class325.SpriteBuffer_spriteCount]; + + for (var6 = 0; var6 < class325.SpriteBuffer_spriteCount; ++var6) { + var7 = var21[var6] = new IndexedSprite(); + var7.width = class325.SpriteBuffer_spriteWidth; + var7.height = class325.SpriteBuffer_spriteHeight; + var7.xOffset = class325.SpriteBuffer_xOffsets[var6]; + var7.yOffset = class325.SpriteBuffer_yOffsets[var6]; + var7.subWidth = UserComparator1.SpriteBuffer_spriteWidths[var6]; + var7.subHeight = class325.SpriteBuffer_spriteHeights[var6]; + var7.palette = class268.SpriteBuffer_spritePalette; + var7.pixels = class290.SpriteBuffer_pixels[var6]; + } + + Message.method1223(); + var1 = var21; + } + + class60.scrollBarSprites = var1; + } else { + ++var0; + } + + if (WorldMapEvent.modIconSprites == null) { + var2 = class3.archive8; + var18 = SecureRandomCallable.spriteIds.field3808; + if (!HitSplatDefinition.method4586(var2, var18, 0)) { + var1 = null; + } else { + var21 = new IndexedSprite[class325.SpriteBuffer_spriteCount]; + + for (var6 = 0; var6 < class325.SpriteBuffer_spriteCount; ++var6) { + var7 = var21[var6] = new IndexedSprite(); + var7.width = class325.SpriteBuffer_spriteWidth; + var7.height = class325.SpriteBuffer_spriteHeight; + var7.xOffset = class325.SpriteBuffer_xOffsets[var6]; + var7.yOffset = class325.SpriteBuffer_yOffsets[var6]; + var7.subWidth = UserComparator1.SpriteBuffer_spriteWidths[var6]; + var7.subHeight = class325.SpriteBuffer_spriteHeights[var6]; + var7.palette = class268.SpriteBuffer_spritePalette; + var7.pixels = class290.SpriteBuffer_pixels[var6]; + } + + Message.method1223(); + var1 = var21; + } + + WorldMapEvent.modIconSprites = var1; + } else { + ++var0; + } + + if (var0 < 11) { + Login.Login_loadingText = "Loading sprites - " + var0 * 100 / 12 + "%"; + Login.Login_loadingPercent = 70; + } else { + AbstractFont.AbstractFont_modIconSprites = WorldMapEvent.modIconSprites; + class40.redHintArrowSprite.normalize(); + var17 = (int)(Math.random() * 21.0D) - 10; + int var20 = (int)(Math.random() * 21.0D) - 10; + var18 = (int)(Math.random() * 21.0D) - 10; + int var19 = (int)(Math.random() * 41.0D) - 20; + class162.mapSceneSprites[0].shiftColors(var19 + var17, var19 + var20, var18 + var19); + Login.Login_loadingText = "Loaded sprites"; + Login.Login_loadingPercent = 70; + Client.titleLoadingStage = 90; + } + } else if (Client.titleLoadingStage == 90) { + if (!WorldMapManager.archive9.isFullyLoaded()) { + Login.Login_loadingText = "Loading textures - " + "0%"; + Login.Login_loadingPercent = 90; + } else { + class14.textureProvider = new TextureProvider(WorldMapManager.archive9, class3.archive8, 20, 0.8D, Client.isLowDetail ? 64 : 128); + Rasterizer3D.Rasterizer3D_setTextureLoader(class14.textureProvider); + Rasterizer3D.Rasterizer3D_setBrightness(0.8D); + Client.titleLoadingStage = 100; + } + } else if (Client.titleLoadingStage == 100) { + var0 = class14.textureProvider.getLoadedPercentage(); + if (var0 < 100) { + Login.Login_loadingText = "Loading textures - " + var0 + "%"; + Login.Login_loadingPercent = 90; + } else { + Login.Login_loadingText = "Loaded textures"; + Login.Login_loadingPercent = 90; + Client.titleLoadingStage = 110; + } + } else if (Client.titleLoadingStage == 110) { + class173.mouseRecorder = new MouseRecorder(); + GameShell.taskHandler.newThreadTask(class173.mouseRecorder, 10); + Login.Login_loadingText = "Loaded input handler"; + Login.Login_loadingPercent = 92; + Client.titleLoadingStage = 120; + } else if (Client.titleLoadingStage == 120) { + if (!ServerBuild.archive10.tryLoadFileByNames("huffman", "")) { + Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; + Login.Login_loadingPercent = 94; + } else { + Huffman var16 = new Huffman(ServerBuild.archive10.takeFileByNames("huffman", "")); + GameObject.method3296(var16); + Login.Login_loadingText = "Loaded wordpack"; + Login.Login_loadingPercent = 94; + Client.titleLoadingStage = 130; + } + } else if (Client.titleLoadingStage == 130) { + if (!WorldMapData_1.archive3.isFullyLoaded()) { + Login.Login_loadingText = "Loading interfaces - " + WorldMapData_1.archive3.loadPercent() * 4 / 5 + "%"; + Login.Login_loadingPercent = 96; + } else if (!SoundSystem.archive12.isFullyLoaded()) { + Login.Login_loadingText = "Loading interfaces - " + (80 + SoundSystem.archive12.loadPercent() / 6) + "%"; + Login.Login_loadingPercent = 96; + } else if (!WorldMapSection1.archive13.isFullyLoaded()) { + Login.Login_loadingText = "Loading interfaces - " + (96 + WorldMapSection1.archive13.loadPercent() / 50) + "%"; + Login.Login_loadingPercent = 96; + } else { + Login.Login_loadingText = "Loaded interfaces"; + Login.Login_loadingPercent = 98; + Client.titleLoadingStage = 140; + } + } else if (Client.titleLoadingStage == 140) { + Login.Login_loadingPercent = 100; + if (!MusicPatchNode2.archive19.tryLoadGroupByName(WorldMapCacheName.field291.name)) { + Login.Login_loadingText = "Loading world map - " + MusicPatchNode2.archive19.groupLoadPercentByName(WorldMapCacheName.field291.name) / 10 + "%"; + } else { + if (GrandExchangeEvent.worldMap == null) { + GrandExchangeEvent.worldMap = new WorldMap(); + GrandExchangeEvent.worldMap.init(MusicPatchNode2.archive19, AbstractWorldMapData.archive18, UserComparator9.archive20, GrandExchangeOffer.fontBold12, Client.fontsMap, class162.mapSceneSprites); + } + + Login.Login_loadingText = "Loaded world map"; + Client.titleLoadingStage = 150; + } + } else if (Client.titleLoadingStage == 150) { + class195.updateGameState(10); + } + } + } + } } } diff --git a/runescape-client/src/main/java/WorldMapSection.java b/runescape-client/src/main/java/WorldMapSection.java index fa983a40dc..61ce60e65e 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("av") +@ObfuscatedName("az") @Implements("WorldMapSection") public interface WorldMapSection { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Laf;I)V", - garbageValue = "-567179164" + signature = "(Laa;I)V", + garbageValue = "515570621" ) @Export("expandBounds") void expandBounds(WorldMapArea var1); - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IIIB)Z", - garbageValue = "0" + signature = "(IIII)Z", + garbageValue = "2033433479" ) @Export("containsCoord") boolean containsCoord(int var1, int var2, int var3); - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(III)Z", - garbageValue = "110675609" + signature = "(IIB)Z", + garbageValue = "-66" ) @Export("containsPosition") boolean containsPosition(int var1, int var2); - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(IIIB)[I", - garbageValue = "69" + signature = "(IIII)[I", + garbageValue = "1684413985" ) @Export("getBorderTileLengths") int[] getBorderTileLengths(int var1, int var2, int var3); - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(III)Lhx;", - garbageValue = "1062204141" + signature = "(IIB)Lht;", + garbageValue = "21" ) @Export("coord") Coord coord(int var1, int var2); - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(Lkg;I)V", - garbageValue = "-179898655" + signature = "(Lkq;B)V", + garbageValue = "74" ) @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 6a18426847..1938419255 100644 --- a/runescape-client/src/main/java/WorldMapSection0.java +++ b/runescape-client/src/main/java/WorldMapSection0.java @@ -4,93 +4,90 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("s") +@ObfuscatedName("u") @Implements("WorldMapSection0") public class WorldMapSection0 implements WorldMapSection { - @ObfuscatedName("bi") - @Export("otp") - static String otp; - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 794568467 + intValue = -1160137245 ) @Export("oldZ") int oldZ; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1084191983 + intValue = -1904283883 ) @Export("newZ") int newZ; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1594820829 + intValue = -314575009 ) @Export("oldX") int oldX; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -937429385 + intValue = 2112889933 ) @Export("oldY") int oldY; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1148101127 + intValue = -792611751 ) @Export("newX") int newX; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 253679643 + intValue = -575856113 ) @Export("newY") int newY; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1649308031 + intValue = -1539446875 ) @Export("oldChunkXLow") int oldChunkXLow; - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 842286875 + intValue = -1657391795 ) @Export("oldChunkYLow") int oldChunkYLow; - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 491567857 + intValue = 442819299 ) @Export("oldChunkXHigh") int oldChunkXHigh; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1271565133 + intValue = 1953687417 ) @Export("oldChunkYHigh") int oldChunkYHigh; - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -79221889 + intValue = -1951120751 ) @Export("newChunkXLow") int newChunkXLow; - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1895250651 + intValue = -940095865 ) @Export("newChunkYLow") int newChunkYLow; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -422163411 + intValue = -777745283 ) @Export("newChunkXHigh") int newChunkXHigh; - @ObfuscatedName("e") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 2009466803 + intValue = -733068917 ) @Export("newChunkYHigh") int newChunkYHigh; @@ -98,10 +95,10 @@ public class WorldMapSection0 implements WorldMapSection { WorldMapSection0() { } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Laf;I)V", - garbageValue = "-567179164" + signature = "(Laa;I)V", + garbageValue = "515570621" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { @@ -123,34 +120,34 @@ public class WorldMapSection0 implements WorldMapSection { } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IIIB)Z", - garbageValue = "0" + signature = "(IIII)Z", + garbageValue = "2033433479" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.oldZ && var1 < this.newZ + this.oldZ) { + if (var1 >= this.oldZ && var1 < this.oldZ + this.newZ) { 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; } } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(III)Z", - garbageValue = "110675609" + signature = "(IIB)Z", + garbageValue = "-66" ) @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("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(IIIB)[I", - garbageValue = "69" + signature = "(IIII)[I", + garbageValue = "1684413985" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { @@ -162,10 +159,10 @@ public class WorldMapSection0 implements WorldMapSection { } } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(III)Lhx;", - garbageValue = "1062204141" + signature = "(IIB)Lht;", + garbageValue = "21" ) @Export("coord") public Coord coord(int var1, int var2) { @@ -178,10 +175,10 @@ public class WorldMapSection0 implements WorldMapSection { } } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(Lkg;I)V", - garbageValue = "-179898655" + signature = "(Lkq;B)V", + garbageValue = "74" ) @Export("read") public void read(Buffer var1) { @@ -202,241 +199,61 @@ public class WorldMapSection0 implements WorldMapSection { this.postRead(); } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-720698828" + garbageValue = "-1568210913" ) @Export("postRead") void postRead() { } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(I)[Lhz;", - garbageValue = "524553725" + signature = "(IB)Liv;", + garbageValue = "-25" ) - public static ServerBuild[] method245() { - return new ServerBuild[]{ServerBuild.WIP, ServerBuild.BUILDLIVE, ServerBuild.LIVE, ServerBuild.RC}; - } - - @ObfuscatedName("gk") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1303877167" - ) - static final void method251() { - for (Projectile var0 = (Projectile)Client.projectiles.last(); var0 != null; var0 = (Projectile)Client.projectiles.previous()) { - if (var0.plane == ClientPacket.Client_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, class195.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 = class215.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, class195.getTileHeight(var3.x, var3.y, var0.plane) - var0.endHeight, Client.cycle); - } - } - - var0.advance(Client.field704); - class2.scene.drawEntity(ClientPacket.Client_plane, (int)var0.x, (int)var0.y, (int)var0.z, 60, var0, var0.yaw, -1L, false); - } - } else { - var0.remove(); - } - } - - } - - @ObfuscatedName("gq") - @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-137026556" - ) - static boolean method257() { - return (Client.drawPlayerNames & 4) != 0; - } - - @ObfuscatedName("ha") - @ObfuscatedSignature( - signature = "(IIZB)V", - garbageValue = "1" - ) - static final void method259(int var0, int var1, boolean var2) { - if (!var2 || var0 != CollisionMap.field2086 || SoundCache.field1438 != var1) { - CollisionMap.field2086 = var0; - SoundCache.field1438 = var1; - class81.updateGameState(25); - WorldMapIcon_1.drawLoadingMessage("Loading - please wait.", true); - int var3 = class51.baseX * 64; - int var4 = VarcInt.baseY * 64; - class51.baseX = (var0 - 6) * 8; - VarcInt.baseY = (var1 - 6) * 8; - int var5 = class51.baseX * 64 - var3; - int var6 = VarcInt.baseY * 64 - var4; - var3 = class51.baseX * 64; - var4 = VarcInt.baseY * 64; - - int var7; - int var9; - int[] var10000; - for (var7 = 0; var7 < 32768; ++var7) { - NPC var8 = Client.npcs[var7]; - if (var8 != null) { - for (var9 = 0; var9 < 10; ++var9) { - var10000 = var8.pathX; - var10000[var9] -= var5; - var10000 = var8.pathY; - var10000[var9] -= var6; - } - - var8.x -= var5 * 128; - var8.y -= var6 * 128; - } - } - - for (var7 = 0; var7 < 2048; ++var7) { - Player var21 = Client.players[var7]; - if (var21 != null) { - for (var9 = 0; var9 < 10; ++var9) { - var10000 = var21.pathX; - var10000[var9] -= var5; - var10000 = var21.pathY; - var10000[var9] -= var6; - } - - var21.x -= var5 * 128; - var21.y -= var6 * 128; - } - } - - byte var20 = 0; - byte var18 = 104; - byte var22 = 1; - if (var5 < 0) { - var20 = 103; - var18 = -1; - var22 = -1; - } - - byte var10 = 0; - byte var11 = 104; - byte var12 = 1; - if (var6 < 0) { - var10 = 103; - var11 = -1; - var12 = -1; - } - - int var14; - for (int var13 = var20; var13 != var18; var13 += var22) { - for (var14 = var10; var14 != var11; var14 += var12) { - int var15 = var13 + var5; - int var16 = var6 + var14; - - for (int var17 = 0; var17 < 4; ++var17) { - if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { - Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; - } else { - Client.groundItems[var17][var13][var14] = null; - } - } - } - } - - for (PendingSpawn var19 = (PendingSpawn)Client.pendingSpawns.last(); var19 != null; var19 = (PendingSpawn)Client.pendingSpawns.previous()) { - var19.x -= var5; - var19.y -= var6; - if (var19.x < 0 || var19.y < 0 || var19.x >= 104 || var19.y >= 104) { - var19.remove(); - } - } - - if (Client.destinationX != 0) { - Client.destinationX -= var5; - Client.destinationY -= var6; - } - - Client.soundEffectCount = 0; - Client.isCameraLocked = false; - class30.cameraX -= var5 << 7; - FloorDecoration.cameraZ -= var6 << 7; - class80.oculusOrbFocalPointX -= var5 << 7; - class81.oculusOrbFocalPointY -= var6 << 7; - Client.field867 = -1; - Client.graphicsObjects.clear(); - Client.projectiles.clear(); - - for (var14 = 0; var14 < 4; ++var14) { - Client.collisionMaps[var14].clear(); + @Export("SequenceDefinition_get") + public static SequenceDefinition SequenceDefinition_get(int var0) { + SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0); + var1 = new SequenceDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); } + var1.postDecode(); + SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); + return var1; } } - @ObfuscatedName("id") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(IIIIIIB)V", - garbageValue = "-57" + signature = "(II)I", + garbageValue = "806992568" ) - static final void method255(int var0, int var1, int var2, int var3, int var4, int var5) { - int var6 = var2 - var0; - int var7 = var3 - var1; - int var8 = var6 >= 0 ? var6 : -var6; - int var9 = var7 >= 0 ? var7 : -var7; - int var10 = var8; - if (var8 < var9) { - var10 = var9; - } - - if (var10 != 0) { - int var11 = (var6 << 16) / var10; - int var12 = (var7 << 16) / var10; - if (var12 <= var11) { - var11 = -var11; - } else { - var12 = -var12; - } - - int var13 = var5 * var12 >> 17; - int var14 = var5 * var12 + 1 >> 17; - int var15 = var5 * var11 >> 17; - int var16 = var5 * var11 + 1 >> 17; - var0 -= Rasterizer2D.Rasterizer2D_xClipStart; - var1 -= Rasterizer2D.Rasterizer2D_yClipStart; - int var17 = var0 + var13; - int var18 = var0 - var14; - int var19 = var0 + var6 - var14; - int var20 = var0 + var6 + var13; - int var21 = var15 + var1; - int var22 = var1 - var16; - int var23 = var7 + var1 - var16; - int var24 = var15 + var7 + var1; - Rasterizer3D.method3035(var17, var18, var19); - Rasterizer3D.method3055(var21, var22, var23, var17, var18, var19, var4); - Rasterizer3D.method3035(var17, var19, var20); - Rasterizer3D.method3055(var21, var23, var24, var17, var19, var20, var4); + @Export("Messages_getNextChatID") + static int Messages_getNextChatID(int var0) { + Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); + if (var1 == null) { + return -1; + } else { + return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; } } - @ObfuscatedName("kd") + @ObfuscatedName("kb") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "-121" + signature = "(Lha;I)I", + garbageValue = "452244252" ) - public static boolean method254() { - return Client.staffModLevel >= 2; + @Export("getWidgetClickMask") + static int getWidgetClickMask(Widget var0) { + IntegerNode var1 = (IntegerNode)Client.widgetClickMasks.get((long)var0.childIndex + ((long)var0.id << 32)); + return var1 != null ? var1.integer : var0.clickMask; } } diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java index d565c8fa48..30edb6f050 100644 --- a/runescape-client/src/main/java/WorldMapSection1.java +++ b/runescape-client/src/main/java/WorldMapSection1.java @@ -3,50 +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("ak") +@ObfuscatedName("aq") @Implements("WorldMapSection1") public class WorldMapSection1 implements WorldMapSection { - @ObfuscatedName("n") + @ObfuscatedName("x") + public static short[][] field269; + @ObfuscatedName("dj") @ObfuscatedSignature( - signature = "[Lmb;" + signature = "Lif;" ) - @Export("JagexCache_idxFiles") - public static BufferedFile[] JagexCache_idxFiles; - @ObfuscatedName("u") + @Export("archive13") + static Archive archive13; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1685599607 + intValue = -129099459 ) @Export("minPlane") int minPlane; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1999692887 + intValue = 2029777559 ) @Export("planes") int planes; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -942650023 + intValue = 1452885269 ) @Export("regionStartX") int regionStartX; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 867361781 + intValue = 1570402195 ) @Export("regionStartY") int regionStartY; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -101152241 + intValue = 387598709 ) @Export("regionEndX") int regionEndX; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1283345723 + intValue = -1600612691 ) @Export("regionEndY") int regionEndY; @@ -54,10 +55,10 @@ public class WorldMapSection1 implements WorldMapSection { WorldMapSection1() { } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Laf;I)V", - garbageValue = "-567179164" + signature = "(Laa;I)V", + garbageValue = "515570621" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { @@ -79,34 +80,34 @@ public class WorldMapSection1 implements WorldMapSection { } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IIIB)Z", - garbageValue = "0" + signature = "(IIII)Z", + garbageValue = "2033433479" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.minPlane && var1 < this.minPlane + this.planes) { + if (var1 >= this.minPlane && var1 < this.planes + this.minPlane) { return var2 >> 6 == this.regionStartX && var3 >> 6 == this.regionStartY; } else { return false; } } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(III)Z", - garbageValue = "110675609" + signature = "(IIB)Z", + garbageValue = "-66" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { return var1 >> 6 == this.regionEndX && var2 >> 6 == this.regionEndY; } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(IIIB)[I", - garbageValue = "69" + signature = "(IIII)[I", + garbageValue = "1684413985" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { @@ -118,10 +119,10 @@ public class WorldMapSection1 implements WorldMapSection { } } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(III)Lhx;", - garbageValue = "1062204141" + signature = "(IIB)Lht;", + garbageValue = "21" ) @Export("coord") public Coord coord(int var1, int var2) { @@ -134,10 +135,10 @@ public class WorldMapSection1 implements WorldMapSection { } } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(Lkg;I)V", - garbageValue = "-179898655" + signature = "(Lkq;B)V", + garbageValue = "74" ) @Export("read") public void read(Buffer var1) { @@ -150,193 +151,24 @@ public class WorldMapSection1 implements WorldMapSection { this.postRead(); } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "24453" + signature = "(B)V", + garbageValue = "-15" ) @Export("postRead") void postRead() { } - @ObfuscatedName("ad") + @ObfuscatedName("gs") @ObfuscatedSignature( - signature = "(ILci;ZI)I", - garbageValue = "2067756787" + signature = "(I)V", + garbageValue = "-1906652083" ) - static int method608(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.CLIENTCLOCK) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.cycle; - return 1; - } else { - int var3; - int var4; - if (var0 == ScriptOpcodes.INV_GETOBJ) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = AttackOption.method2098(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INV_GETNUM) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = class286.ItemContainer_getCount(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INV_TOTAL) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = class96.method2314(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INV_SIZE) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = TextureProvider.getInvDefinition(var3).size; - return 1; - } else if (var0 == ScriptOpcodes.STAT) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; - return 1; - } else if (var0 == ScriptOpcodes.STAT_BASE) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.levels[var3]; - return 1; - } else if (var0 == ScriptOpcodes.STAT_XP) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.experience[var3]; - return 1; - } else { - int var5; - if (var0 == ScriptOpcodes.COORD) { - var3 = ClientPacket.Client_plane; - var4 = class51.baseX * 64 + (class215.localPlayer.x >> 7); - var5 = VarcInt.baseY * 64 + (class215.localPlayer.y >> 7); - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); - return 1; - } else if (var0 == ScriptOpcodes.COORDX) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; - return 1; - } else if (var0 == ScriptOpcodes.COORDZ) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3 >> 28; - return 1; - } else if (var0 == ScriptOpcodes.COORDY) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3 & 16383; - return 1; - } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = AttackOption.method2098(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = class286.ItemContainer_getCount(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = class96.method2314(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { - if (Client.staffModLevel >= 2) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.staffModLevel; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.REBOOTTIMER) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.rebootTimer; - return 1; - } else if (var0 == ScriptOpcodes.MAP_WORLD) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.worldId; - return 1; - } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.runEnergy; - return 1; - } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.weight; - return 1; - } else if (var0 == ScriptOpcodes.PLAYERMOD) { - if (Client.playerMod) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDFLAGS) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.worldProperties; - return 1; - } else if (var0 == ScriptOpcodes.MOVECOORD) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 2]; - int var6 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 3]; - var3 += var4 << 14; - var3 += var5 << 28; - var3 += var6; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3; - return 1; - } else { - return 2; - } - } - } - } - - @ObfuscatedName("iy") - @ObfuscatedSignature( - signature = "(Lhl;IIZI)V", - garbageValue = "-521938970" - ) - @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.field2594 * var0.height / var0.field2694; - } - - if (var0.heightAlignment == 4) { - var0.height = var0.width * var0.field2694 / var0.field2594; - } - - 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 method584() { + if (GrandExchangeEvent.worldMap != null) { + GrandExchangeEvent.worldMap.method6367(UrlRequest.Client_plane, MusicPatchPcmStream.baseX * 64 + (Message.localPlayer.x >> 7), ScriptEvent.baseY * 64 + (Message.localPlayer.y >> 7), false); + GrandExchangeEvent.worldMap.loadCache(); } } diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java index e2c531b5f6..4072d37a0c 100644 --- a/runescape-client/src/main/java/WorldMapSection2.java +++ b/runescape-client/src/main/java/WorldMapSection2.java @@ -4,164 +4,162 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("l") +@ObfuscatedName("r") @Implements("WorldMapSection2") public class WorldMapSection2 implements WorldMapSection { - @ObfuscatedName("nk") + @ObfuscatedName("nb") @ObfuscatedGetter( - intValue = 1891389593 + intValue = 1762244161 ) - static int field200; - @ObfuscatedName("d") + @Export("widgetDragDuration") + static int widgetDragDuration; + @ObfuscatedName("gn") + @Export("regions") + static int[] regions; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1524934865 - ) - @Export("clientTickTimeIdx") - static int clientTickTimeIdx; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 955020079 + intValue = 2107748955 ) @Export("minPlane") int minPlane; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1414372251 + intValue = -841656425 ) @Export("planes") int planes; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 779916199 + intValue = -1431840249 ) @Export("regionStartX") int regionStartX; - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1695825611 + intValue = 537268121 ) @Export("regionStartY") int regionStartY; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1541446225 + intValue = 1669995065 ) @Export("regionEndX") int regionEndX; - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1892372645 + intValue = 188092539 ) @Export("regionEndY") int regionEndY; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1196441943 + intValue = 954202009 ) - int field194; - @ObfuscatedName("y") + int field177; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1727293363 + intValue = -51242925 ) - int field195; - @ObfuscatedName("w") + int field181; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1979439593 + intValue = 169848389 ) - int field196; - @ObfuscatedName("i") + int field182; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 736473599 + intValue = -1576272075 ) - int field197; + int field183; WorldMapSection2() { } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Laf;I)V", - garbageValue = "-567179164" + signature = "(Laa;I)V", + garbageValue = "515570621" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field194) { - var1.regionLowX = this.field194; + if (var1.regionLowX > this.field177) { + var1.regionLowX = this.field177; } - if (var1.regionHighX < this.field196) { - var1.regionHighX = this.field196; + if (var1.regionHighX < this.field182) { + var1.regionHighX = this.field182; } - if (var1.regionLowY > this.field195) { - var1.regionLowY = this.field195; + if (var1.regionLowY > this.field181) { + var1.regionLowY = this.field181; } - if (var1.regionHighY < this.field197) { - var1.regionHighY = this.field197; + if (var1.regionHighY < this.field183) { + var1.regionHighY = this.field183; } } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IIIB)Z", - garbageValue = "0" + signature = "(IIII)Z", + garbageValue = "2033433479" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.minPlane && var1 < this.minPlane + this.planes) { + 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; } } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(III)Z", - garbageValue = "110675609" + signature = "(IIB)Z", + garbageValue = "-66" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >> 6 >= this.field194 && var1 >> 6 <= this.field196 && var2 >> 6 >= this.field195 && var2 >> 6 <= this.field197; + return var1 >> 6 >= this.field177 && var1 >> 6 <= this.field182 && var2 >> 6 >= this.field181 && var2 >> 6 <= this.field183; } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(IIIB)[I", - garbageValue = "69" + signature = "(IIII)[I", + garbageValue = "1684413985" ) @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.field194 * 64 - this.regionStartX * 64 + var2, var3 + (this.field195 * 64 - this.regionStartY * 64)}; + int[] var4 = new int[]{this.field177 * 64 - this.regionStartX * 64 + var2, var3 + (this.field181 * 64 - this.regionStartY * 64)}; return var4; } } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(III)Lhx;", - garbageValue = "1062204141" + signature = "(IIB)Lht;", + garbageValue = "21" ) @Export("coord") public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { return null; } else { - int var3 = this.regionStartX * 64 - this.field194 * 64 + var1; - int var4 = this.regionStartY * 64 - this.field195 * 64 + var2; + int var3 = this.regionStartX * 64 - this.field177 * 64 + var1; + int var4 = this.regionStartY * 64 - this.field181 * 64 + var2; return new Coord(this.minPlane, var3, var4); } } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(Lkg;I)V", - garbageValue = "-179898655" + signature = "(Lkq;B)V", + garbageValue = "74" ) @Export("read") public void read(Buffer var1) { @@ -171,195 +169,88 @@ public class WorldMapSection2 implements WorldMapSection { this.regionStartY = var1.readUnsignedShort(); this.regionEndX = var1.readUnsignedShort(); this.regionEndY = var1.readUnsignedShort(); - this.field194 = var1.readUnsignedShort(); - this.field195 = var1.readUnsignedShort(); - this.field196 = var1.readUnsignedShort(); - this.field197 = var1.readUnsignedShort(); + this.field177 = var1.readUnsignedShort(); + this.field181 = var1.readUnsignedShort(); + this.field182 = var1.readUnsignedShort(); + this.field183 = var1.readUnsignedShort(); this.postRead(); } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "8" + signature = "(I)V", + garbageValue = "1724317369" ) @Export("postRead") void postRead() { } - @ObfuscatedName("w") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "582291691" + signature = "(II)I", + garbageValue = "-261996704" ) - static final void method347(String var0) { - GrandExchangeOfferAgeComparator.addGameMessage(30, "", var0); + public static int method322(int var0) { + return class2.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var0]); } - @ObfuscatedName("hk") + @ObfuscatedName("jz") @ObfuscatedSignature( - signature = "(ZLkj;I)V", - garbageValue = "-1922958923" + signature = "(Lha;IIIIIIB)V", + garbageValue = "16" ) - @Export("updateNpcs") - static final void updateNpcs(boolean var0, PacketBuffer var1) { - Client.field814 = 0; - Client.field687 = 0; - WorldMapArea.method424(); - DynamicObject.method2262(var0, var1); - - int var2; - int var3; - for (var2 = 0; var2 < Client.field687; ++var2) { - var3 = Client.field688[var2]; - NPC var4 = Client.npcs[var3]; - int var5 = var1.readUnsignedByte(); - int var6; - int var7; - int var8; - int var9; - if ((var5 & 4) != 0) { - var6 = var1.method5689(); - 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 == 32767) { - 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.method5631(); - if (var7 > 0) { - for (var8 = 0; var8 < var7; ++var8) { - var9 = var1.readUShortSmart(); - var10 = var1.readUShortSmart(); - if (var10 != 32767) { - var11 = var1.readUShortSmart(); - var12 = var1.readUnsignedByte(); - int var13 = var10 > 0 ? var1.readUnsignedByte() : var12; - var4.addHealthBar(var9, Client.cycle, var10, var11, var12, var13); - } else { - var4.removeHealthBar(var9); - } - } - } - } - - if ((var5 & 16) != 0) { - var4.targetIndex = var1.readUnsignedShort(); - if (var4.targetIndex == 65535) { - var4.targetIndex = -1; - } - } - - if ((var5 & 32) != 0) { - var4.overheadText = var1.readStringCp1252NullTerminated(); - var4.overheadTextCyclesRemaining = 100; - } - - if ((var5 & 2) != 0) { - var6 = var1.readUnsignedShort(); - if (var6 == 65535) { - var6 = -1; - } - - var7 = var1.readUnsignedByte(); - if (var6 == var4.sequence && var6 != -1) { - var8 = GrandExchangeOfferAgeComparator.SequenceDefinition_get(var6).field3533; - if (var8 == 1) { - var4.sequenceFrame = 0; - var4.sequenceFrameCycle = 0; - var4.sequenceDelay = var7; - var4.field971 = 0; - } - - if (var8 == 2) { - var4.field971 = 0; - } - } else if (var6 == -1 || var4.sequence == -1 || GrandExchangeOfferAgeComparator.SequenceDefinition_get(var6).field3527 >= GrandExchangeOfferAgeComparator.SequenceDefinition_get(var4.sequence).field3527) { - var4.sequence = var6; - var4.sequenceFrame = 0; - var4.sequenceFrameCycle = 0; - var4.sequenceDelay = var7; - var4.field971 = 0; - var4.field994 = var4.pathLength; - } - } - - if ((var5 & 1) != 0) { - var4.definition = VarcInt.getNpcDefinition(var1.method5640()); - var4.field938 = var4.definition.size; - var4.field988 = 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 & 64) != 0) { - var4.spotAnimation = var1.method5640(); - var6 = var1.readInt(); - var4.field996 = var6 >> 16; - var4.field975 = (var6 & 65535) + Client.cycle; - var4.spotAnimationFrame = 0; - var4.spotAnimationFrameCycle = 0; - if (var4.field975 > Client.cycle) { - var4.spotAnimationFrame = -1; - } - - if (var4.spotAnimation == 65535) { - var4.spotAnimation = -1; - } - } - - if ((var5 & 8) != 0) { - var6 = var1.readUnsignedShort(); - var7 = var1.readUnsignedShort(); - var8 = var4.x - (var6 - class51.baseX * 64 - class51.baseX * 64) * 64; - var9 = var4.y - (var7 - VarcInt.baseY * 64 - VarcInt.baseY * 64) * 64; - if (var8 != 0 || var9 != 0) { - var4.field965 = (int)(Math.atan2((double)var8, (double)var9) * 325.949D) & 2047; - } - } - } - - for (var2 = 0; var2 < Client.field814; ++var2) { - var3 = Client.field764[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); + static final void method321(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (Client.field695) { + Client.alternativeScrollbarWidth = 32; } else { - for (var2 = 0; var2 < Client.npcCount; ++var2) { - if (Client.npcs[Client.npcIndices[var2]] == null) { - throw new RuntimeException(var2 + "," + Client.npcCount); - } - } + Client.alternativeScrollbarWidth = 0; + } + Client.field695 = false; + int var7; + if (MouseHandler.MouseHandler_currentButton == 1 || !NetFileRequest.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { + if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { + var0.scrollY -= 4; + LoginPacket.invalidateWidget(var0); + } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { + var0.scrollY += 4; + LoginPacket.invalidateWidget(var0); + } else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { + var7 = var3 * (var3 - 32) / var4; + if (var7 < 8) { + var7 = 8; + } + + int var8 = var6 - var2 - 16 - var7 / 2; + int var9 = var3 - 32 - var7; + var0.scrollY = var8 * (var4 - var3) / var9; + LoginPacket.invalidateWidget(var0); + Client.field695 = true; + } + } + + if (Client.mouseWheelRotation != 0) { + var7 = var0.width; + if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { + var0.scrollY += Client.mouseWheelRotation * 45; + LoginPacket.invalidateWidget(var0); + } + } + + } + + @ObfuscatedName("ky") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)V", + garbageValue = "-1461101470" + ) + @Export("Clan_joinChat") + static final void Clan_joinChat(String var0) { + if (!var0.equals("")) { + PacketBufferNode var1 = class2.getPacketBufferNode(ClientPacket.field2259, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(ViewportMouse.stringCp1252NullTerminatedByteSize(var0)); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); } } } diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java index b33c431e6b..ee2eeec85c 100644 --- a/runescape-client/src/main/java/WorldMapSectionType.java +++ b/runescape-client/src/main/java/WorldMapSectionType.java @@ -1,44 +1,53 @@ +import java.lang.management.GarbageCollectorMXBean; +import java.lang.management.ManagementFactory; +import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("t") +@ObfuscatedName("z") @Implements("WorldMapSectionType") public enum WorldMapSectionType implements Enumerated { - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lt;" - ) - @Export("WORLDMAPSECTIONTYPE0") - WORLDMAPSECTIONTYPE0(0, (byte)0), @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lt;" + signature = "Lz;" + ) + @Export("WORLDMAPSECTIONTYPE0") + WORLDMAPSECTIONTYPE0(3, (byte)0), + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "Lz;" ) @Export("WORLDMAPSECTIONTYPE1") - WORLDMAPSECTIONTYPE1(2, (byte)1), - @ObfuscatedName("b") + WORLDMAPSECTIONTYPE1(0, (byte)1), + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lt;" + signature = "Lz;" ) @Export("WORLDMAPSECTIONTYPE2") WORLDMAPSECTIONTYPE2(1, (byte)2), - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lt;" + signature = "Lz;" ) @Export("WORLDMAPSECTIONTYPE3") - WORLDMAPSECTIONTYPE3(3, (byte)3); + WORLDMAPSECTIONTYPE3(2, (byte)3); - @ObfuscatedName("z") + @ObfuscatedName("hi") @ObfuscatedGetter( - intValue = -740472387 + intValue = 75470723 + ) + @Export("oculusOrbFocalPointX") + static int oculusOrbFocalPointX; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -814445795 ) @Export("type") final int type; - @ObfuscatedName("p") + @ObfuscatedName("b") @Export("id") final byte id; @@ -47,111 +56,174 @@ public enum WorldMapSectionType implements Enumerated { this.id = var4; } - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "7" + garbageValue = "-57" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(I)[Lt;", - garbageValue = "-1446334113" + signature = "(I)[Lz;", + garbageValue = "198707251" ) - static WorldMapSectionType[] method262() { - return new WorldMapSectionType[]{WORLDMAPSECTIONTYPE3, WORLDMAPSECTIONTYPE0, WORLDMAPSECTIONTYPE1, WORLDMAPSECTIONTYPE2}; + static WorldMapSectionType[] method235() { + return new WorldMapSectionType[]{WORLDMAPSECTIONTYPE3, WORLDMAPSECTIONTYPE1, WORLDMAPSECTIONTYPE2, WORLDMAPSECTIONTYPE0}; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "748001828" + signature = "(B)V", + garbageValue = "125" ) - static void method265() { - Skeleton.field1788 = new int[2000]; + static void method236() { + for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var0.stream1 != null) { + Tiles.pcmStreamMixer.removeSubStream(var0.stream1); + var0.stream1 = null; + } + + if (var0.stream2 != null) { + Tiles.pcmStreamMixer.removeSubStream(var0.stream2); + var0.stream2 = null; + } + } + + ObjectSound.objectSounds.clear(); + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + signature = "(B)I", + garbageValue = "20" + ) + @Export("getGcDuration") + protected static int getGcDuration() { int var0 = 0; - int var1 = 240; + if (Interpreter.garbageCollector == null || !Interpreter.garbageCollector.isValid()) { + try { + Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); - int var3; - for (byte var2 = 12; var0 < 16; var1 -= var2) { - var3 = Huffman.method4020((double)((float)var1 / 360.0F), 0.9998999834060669D, (double)(0.075F + 0.425F * (float)var0 / 16.0F)); - Skeleton.field1788[var0] = var3; - ++var0; - } - - var1 = 48; - - for (int var5 = var1 / 6; var0 < Skeleton.field1788.length; var1 -= var5) { - var3 = var0 * 2; - - for (int var4 = Huffman.method4020((double)((float)var1 / 360.0F), 0.9998999834060669D, 0.5D); var0 < var3 && var0 < Skeleton.field1788.length; ++var0) { - Skeleton.field1788[var0] = var4; + while (var1.hasNext()) { + GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); + if (var2.isValid()) { + Interpreter.garbageCollector = var2; + GameShell.garbageCollectorLastCheckTimeMs = -1L; + GameShell.garbageCollectorLastCollectionTime = -1L; + } + } + } catch (Throwable var11) { } } - } - - @ObfuscatedName("p") - public static int method271(long var0) { - return (int)(var0 >>> 7 & 127L); - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(Lhl;I[B[BB)V", - garbageValue = "98" - ) - @Export("Widget_setKey") - static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { - if (var0.field2592 == null) { - if (var2 == null) { - return; - } - - var0.field2592 = new byte[11][]; - var0.field2653 = new byte[11][]; - var0.field2654 = new int[11]; - var0.field2655 = new int[11]; - } - - var0.field2592[var1] = var2; - if (var2 != null) { - var0.field2651 = true; - } else { - var0.field2651 = false; - - for (int var4 = 0; var4 < var0.field2592.length; ++var4) { - if (var0.field2592[var4] != null) { - var0.field2651 = true; - break; + if (Interpreter.garbageCollector != null) { + long var9 = WorldMapID.currentTimeMillis(); + long var3 = Interpreter.garbageCollector.getCollectionTime(); + if (GameShell.garbageCollectorLastCollectionTime != -1L) { + long var5 = var3 - GameShell.garbageCollectorLastCollectionTime; + long var7 = var9 - GameShell.garbageCollectorLastCheckTimeMs; + if (0L != var7) { + var0 = (int)(var5 * 100L / var7); } } + + GameShell.garbageCollectorLastCollectionTime = var3; + GameShell.garbageCollectorLastCheckTimeMs = var9; } - var0.field2653[var1] = var3; + return var0; } - @ObfuscatedName("n") + @ObfuscatedName("gq") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "-2113411095" + signature = "(Lbv;I)V", + garbageValue = "-821947807" ) - static final void method269(String var0) { - WorldMapSection2.method347("Please remove " + var0 + " from your friend list first"); - } - - @ObfuscatedName("ih") - @ObfuscatedSignature( - signature = "(IIIZI)V", - garbageValue = "-1551677344" - ) - static final void method272(int var0, int var1, int var2, boolean var3) { - if (UserComparator3.loadInterface(var0)) { - class225.resizeInterface(FloorDecoration.Widget_interfaceComponents[var0], -1, var1, var2, var3); + static final void method239(Actor var0) { + if (var0.field969 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > WorldMapSection0.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { + int var1 = var0.field969 - var0.field950; + int var2 = Client.cycle - var0.field950; + int var3 = var0.field921 * 128 + var0.field925 * 64; + int var4 = var0.field966 * 128 + var0.field925 * 64; + int var5 = var0.field965 * 128 + var0.field925 * 64; + int var6 = var0.field929 * 128 + var0.field925 * 64; + var0.x = (var2 * var5 + var3 * (var1 - var2)) / var1; + var0.y = (var2 * var6 + var4 * (var1 - var2)) / var1; } + + var0.field980 = 0; + var0.orientation = var0.field970; + var0.rotation = var0.orientation; + } + + @ObfuscatedName("jl") + @ObfuscatedSignature( + signature = "(IB)Ljava/lang/String;", + garbageValue = "24" + ) + @Export("formatItemStacks") + static final String formatItemStacks(int var0) { + String var1 = Integer.toString(var0); + + for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { + var1 = var1.substring(0, var2) + "," + var1.substring(var2); + } + + if (var1.length() > 9) { + return " " + NPC.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; + } else { + return var1.length() > 6 ? " " + NPC.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + NPC.colorStartTag(16776960) + var1 + ""; + } + } + + @ObfuscatedName("lp") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;ZB)V", + garbageValue = "-1" + ) + @Export("findItemDefinitions") + static void findItemDefinitions(String var0, boolean var1) { + var0 = var0.toLowerCase(); + short[] var2 = new short[16]; + int var3 = 0; + + for (int var4 = 0; var4 < ItemDefinition.ItemDefinition_fileCount; ++var4) { + ItemDefinition var5 = PacketBufferNode.ItemDefinition_get(var4); + if ((!var1 || var5.isTradable) && var5.noteTemplate == -1 && var5.name.toLowerCase().indexOf(var0) != -1) { + if (var3 >= 250) { + KeyHandler.foundItemIdCount = -1; + class269.foundItemIds = null; + return; + } + + if (var3 >= var2.length) { + short[] var6 = new short[var2.length * 2]; + + for (int var7 = 0; var7 < var3; ++var7) { + var6[var7] = var2[var7]; + } + + var2 = var6; + } + + var2[var3++] = (short)var4; + } + } + + class269.foundItemIds = var2; + class189.foundItemIndex = 0; + KeyHandler.foundItemIdCount = var3; + String[] var8 = new String[KeyHandler.foundItemIdCount]; + + for (int var9 = 0; var9 < KeyHandler.foundItemIdCount; ++var9) { + var8[var9] = PacketBufferNode.ItemDefinition_get(var2[var9]).name; + } + + short[] var10 = class269.foundItemIds; + ParamDefinition.sortItemsByName(var8, var10, 0, var8.length - 1); } } diff --git a/runescape-client/src/main/java/WorldMapSprite.java b/runescape-client/src/main/java/WorldMapSprite.java index 04d8285d18..4e36b729f6 100644 --- a/runescape-client/src/main/java/WorldMapSprite.java +++ b/runescape-client/src/main/java/WorldMapSprite.java @@ -1,21 +1,18 @@ +import java.awt.FontMetrics; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ad") +@ObfuscatedName("av") @Implements("WorldMapSprite") public final class WorldMapSprite { - @ObfuscatedName("h") - @Export("ByteArrayPool_alternativeSizes") - static int[] ByteArrayPool_alternativeSizes; - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Lgt;" - ) - @Export("musicTrack") - public static MusicTrack musicTrack; - @ObfuscatedName("f") + @ObfuscatedName("j") + static String[] field219; + @ObfuscatedName("ak") + @Export("loginScreenFontMetrics") + static FontMetrics loginScreenFontMetrics; + @ObfuscatedName("i") @Export("tileColors") final int[] tileColors; @@ -27,23 +24,44 @@ public final class WorldMapSprite { this.tileColors = var1; } - @ObfuscatedName("u") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(III)I", - garbageValue = "1354976876" + garbageValue = "-1062686446" ) @Export("getTileColor") final int getTileColor(int var1, int var2) { - return this.tileColors[var2 * 64 + var1]; + return this.tileColors[var1 + var2 * 64]; } - @ObfuscatedName("ib") + @ObfuscatedName("fm") @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;IIIII)V", - garbageValue = "-1935936401" + signature = "(II)V", + garbageValue = "-1175490871" ) - @Export("insertMenuItemNoShift") - public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { - class14.insertMenuItem(var0, var1, var2, var3, var4, var5, false); + @Export("playSong") + static void playSong(int var0) { + if (var0 == -1 && !Client.field767) { + Actor.method1755(); + } else if (var0 != -1 && var0 != Client.currentTrackGroupId && Client.musicVolume != 0 && !Client.field767) { + class4.method59(2, GrandExchangeOfferWorldComparator.archive6, var0, 0, Client.musicVolume, false); + } + + Client.currentTrackGroupId = var0; + } + + @ObfuscatedName("gu") + @ObfuscatedSignature( + signature = "(IIB)V", + garbageValue = "-50" + ) + static final void method408(int var0, int var1) { + if (Client.hintArrowType == 2) { + KeyHandler.worldToScreen((Client.hintArrowX - MusicPatchPcmStream.baseX * 64 << 7) + Client.hintArrowSubX * 4096, (Client.hintArrowY - ScriptEvent.baseY * 64 << 7) + Client.hintArrowSubY * 4096, Client.hintArrowHeight * 2); + if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { + WorldMapData_0.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); + } + + } } } diff --git a/runescape-client/src/main/java/Wrapper.java b/runescape-client/src/main/java/Wrapper.java index b955b1ee84..86be9d4e3f 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("ev") +@ObfuscatedName("ff") @Implements("Wrapper") public abstract class Wrapper extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("size") final int size; @@ -13,11 +13,11 @@ public abstract class Wrapper extends DualNode { this.size = var1; } - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("get") abstract Object get(); - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("isSoft") abstract boolean isSoft(); } diff --git a/runescape-client/src/main/java/class0.java b/runescape-client/src/main/java/class0.java index f423b8e04d..9d1fcd70e2 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("u") +@ObfuscatedName("f") public interface class0 { - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(Ljava/lang/Object;Lkg;I)V", - garbageValue = "-1331780546" - ) - void vmethod57(Object var1, Buffer var2); - @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Lkg;I)Ljava/lang/Object;", - garbageValue = "1713449680" + signature = "(Ljava/lang/Object;Lkq;I)V", + garbageValue = "-685052934" ) - Object vmethod65(Buffer var1); + void vmethod53(Object var1, Buffer var2); + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(Lkq;I)Ljava/lang/Object;", + garbageValue = "390816352" + ) + Object vmethod60(Buffer var1); } diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java index 208dc8cf29..30f413a6f2 100644 --- a/runescape-client/src/main/java/class1.java +++ b/runescape-client/src/main/java/class1.java @@ -1,88 +1,78 @@ import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("f") +@ObfuscatedName("i") final class class1 implements class0 { - @ObfuscatedName("ix") - @ObfuscatedGetter( - intValue = -609036975 - ) - @Export("selectedItemWidget") - static int selectedItemWidget; - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(Ljava/lang/Object;Lkg;I)V", - garbageValue = "-1331780546" - ) - public void vmethod57(Object var1, Buffer var2) { - this.method7((Integer)var1, var2); - } - @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Lkg;I)Ljava/lang/Object;", - garbageValue = "1713449680" + signature = "(Ljava/lang/Object;Lkq;I)V", + garbageValue = "-685052934" ) - public Object vmethod65(Buffer var1) { + public void vmethod53(Object var1, Buffer var2) { + this.method8((Integer)var1, var2); + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(Lkq;I)Ljava/lang/Object;", + garbageValue = "390816352" + ) + public Object vmethod60(Buffer var1) { return var1.readInt(); } - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Ljava/lang/Integer;Lkg;I)V", - garbageValue = "-1969898467" + signature = "(Ljava/lang/Integer;Lkq;I)V", + garbageValue = "-1005316457" ) - void method7(Integer var1, Buffer var2) { + void method8(Integer var1, Buffer var2) { var2.writeInt(var1); } - @ObfuscatedName("w") + @ObfuscatedName("gv") @ObfuscatedSignature( - signature = "(I)Lbp;", - garbageValue = "1259947083" + signature = "(Ljava/lang/String;ZB)V", + garbageValue = "-52" ) - @Export("getNextWorldListWorld") - static World getNextWorldListWorld() { - return World.World_listCount < World.World_count ? Skills.World_worlds[++World.World_listCount - 1] : null; - } + @Export("drawLoadingMessage") + static final void drawLoadingMessage(String var0, boolean var1) { + if (Client.showLoadingMessages) { + byte var2 = 4; + int var3 = var2 + 6; + int var4 = var2 + 6; + int var5 = ScriptFrame.fontPlain12.lineWidth(var0, 250); + int var6 = ScriptFrame.fontPlain12.lineCount(var0, 250) * 13; + Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var6 + var2, 0); + Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var2 + var2 + var6, 16777215); + ScriptFrame.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); + GameObject.method3297(var3 - var2, var4 - var2, var2 + var5 + var2, var6 + var2 + var2); + if (var1) { + IgnoreList.rasterProvider.drawFull(0, 0); + } else { + int var7 = var3; + int var8 = var4; + int var9 = var5; + int var10 = var6; + + for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { + if (Client.rootWidgetXs[var11] + Client.rootWidgetWidths[var11] > var7 && Client.rootWidgetXs[var11] < var9 + var7 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var10 + var8) { + Client.field834[var11] = true; + } + } + } - @ObfuscatedName("ab") - @ObfuscatedSignature( - signature = "(Ldt;B)V", - garbageValue = "104" - ) - @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("ev") + @ObfuscatedName("ij") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1824721053" + signature = "(Ljava/lang/String;Ljava/lang/String;IIIIB)V", + garbageValue = "3" ) - static final void method15() { - Scene.Scene_isLowDetail = false; - Client.isLowDetail = false; - } - - @ObfuscatedName("gz") - @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "1" - ) - static boolean method16() { - return (Client.drawPlayerNames & 1) != 0; + @Export("insertMenuItemNoShift") + public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { + AbstractWorldMapIcon.insertMenuItem(var0, var1, var2, var3, var4, var5, false); } } diff --git a/runescape-client/src/main/java/class13.java b/runescape-client/src/main/java/class13.java index df68db77a8..ff7fc035e1 100644 --- a/runescape-client/src/main/java/class13.java +++ b/runescape-client/src/main/java/class13.java @@ -1,80 +1,75 @@ +import java.awt.Desktop; +import java.awt.Desktop.Action; +import java.net.URI; import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("e") +@ObfuscatedName("k") public class class13 { - @ObfuscatedName("br") - @ObfuscatedGetter( - intValue = 1914182179 - ) - static int field91; - @ObfuscatedName("dd") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lij;" + signature = "(Ljava/lang/String;ZZI)V", + garbageValue = "637886489" ) - @Export("archive19") - static Archive archive19; + @Export("openURL") + public static void openURL(String var0, boolean var1, boolean var2) { + if (var1) { + if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { + try { + Desktop.getDesktop().browse(new URI(var0)); + return; + } catch (Exception var4) { + } + } - @ObfuscatedName("fa") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "507388741" - ) - @Export("doCheat") - static final void doCheat(String var0) { - if (var0.equalsIgnoreCase("toggleroof")) { - UserComparator10.clientPreferences.roofsHidden = !UserComparator10.clientPreferences.roofsHidden; - class40.savePreferences(); - if (UserComparator10.clientPreferences.roofsHidden) { - GrandExchangeOfferAgeComparator.addGameMessage(99, "", "Roofs are now all hidden"); + if (class50.field410.startsWith("win")) { + class216.method4017(var0, 0); + } else if (class50.field410.startsWith("mac")) { + GrandExchangeEvent.method79(var0, 1, "openjs"); } else { - GrandExchangeOfferAgeComparator.addGameMessage(99, "", "Roofs will only be removed selectively"); + class216.method4017(var0, 2); } + } else { + class216.method4017(var0, 3); } - if (var0.equalsIgnoreCase("displayfps")) { - Client.displayFps = !Client.displayFps; + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "(IIIIB)I", + garbageValue = "119" + ) + static final int method150(int var0, int var1, int var2, int var3) { + int var4 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var2 * 1024 / var3] >> 1; + return ((65536 - var4) * var0 >> 16) + (var4 * var1 >> 16); + } + + @ObfuscatedName("iw") + @ObfuscatedSignature( + signature = "(IIIIIIIII)V", + garbageValue = "1952174760" + ) + @Export("drawWidgets") + static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + if (MusicPatch.loadInterface(var0)) { + ClientPacket.field2223 = null; + UserComparator7.drawInterface(UserComparator7.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); + if (ClientPacket.field2223 != null) { + UserComparator7.drawInterface(ClientPacket.field2223, -1412584499, var1, var2, var3, var4, GrandExchangeEvents.field31, class81.field1126, var7); + ClientPacket.field2223 = null; + } + + } else { + if (var7 != -1) { + Client.field833[var7] = true; + } else { + for (int var8 = 0; var8 < 100; ++var8) { + Client.field833[var8] = true; + } + } + } - - 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")) { - WorldMapRegion.worldMap.showCoord = !WorldMapRegion.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")) { - Projectile.method2137(); - } - } - - PacketBufferNode var1 = ModelData0.getPacketBufferNode(ClientPacket.field2246, 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/class14.java b/runescape-client/src/main/java/class14.java index 988021a951..56323e1d8e 100644 --- a/runescape-client/src/main/java/class14.java +++ b/runescape-client/src/main/java/class14.java @@ -1,64 +1,225 @@ -import java.awt.Component; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("n") +@ObfuscatedName("s") public class class14 { - @ObfuscatedName("u") + @ObfuscatedName("w") + static byte[][][] field88; + @ObfuscatedName("v") + public static boolean field89; + @ObfuscatedName("gs") @ObfuscatedSignature( - signature = "Lhf;" + signature = "Lej;" ) - @Export("KitDefinition_archive") - static AbstractArchive KitDefinition_archive; + @Export("scene") + static Scene scene; + @ObfuscatedName("je") + @ObfuscatedSignature( + signature = "Ldt;" + ) + @Export("textureProvider") + static TextureProvider textureProvider; + @ObfuscatedName("lx") + @ObfuscatedSignature( + signature = "Lha;" + ) + static Widget field90; @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Ljava/awt/Component;B)V", - garbageValue = "66" + signature = "(IILfx;Lfp;B)Z", + garbageValue = "-12" ) - static void method178(Component var0) { - var0.setFocusTraversalKeysEnabled(false); - var0.addKeyListener(KeyHandler.KeyHandler_instance); - var0.addFocusListener(KeyHandler.KeyHandler_instance); - } + public static final boolean method158(int var0, int var1, RouteStrategy var2, CollisionMap var3) { + int var4 = var0; + int var5 = var1; + byte var6 = 64; + byte var7 = 64; + int var8 = var0 - var6; + int var9 = var1 - var7; + class173.directions[var6][var7] = 99; + class173.distances[var6][var7] = 0; + byte var10 = 0; + int var11 = 0; + class173.bufferX[var10] = var0; + byte var10001 = var10; + int var18 = var10 + 1; + class173.bufferY[var10001] = var1; + int[][] var12 = var3.flags; - @ObfuscatedName("hr") - @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "-1" - ) - static int method176(int var0, int var1) { - int var2 = var1 - 334; - if (var2 < 0) { - var2 = 0; - } else if (var2 > 100) { - var2 = 100; - } - - int var3 = (Client.zoomWidth - Client.zoomHeight) * var2 / 100 + Client.zoomHeight; - return var0 * var3 / 256; - } - - @ObfuscatedName("is") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V", - garbageValue = "-1867920411" - ) - @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; + while (var11 != var18) { + var4 = class173.bufferX[var11]; + var5 = class173.bufferY[var11]; + var11 = var11 + 1 & 4095; + int var16 = var4 - var8; + int var17 = var5 - var9; + int var13 = var4 - var3.xInset; + int var14 = var5 - var3.yInset; + if (var2.hasArrived(1, var4, var5, var3)) { + class268.field3524 = var4; + class173.field2072 = var5; + return true; } + int var15 = class173.distances[var16][var17] + 1; + if (var16 > 0 && class173.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136776) == 0) { + class173.bufferX[var18] = var4 - 1; + class173.bufferY[var18] = var5; + var18 = var18 + 1 & 4095; + class173.directions[var16 - 1][var17] = 2; + class173.distances[var16 - 1][var17] = var15; + } + + if (var16 < 127 && class173.directions[var16 + 1][var17] == 0 && (var12[var13 + 1][var14] & 19136896) == 0) { + class173.bufferX[var18] = var4 + 1; + class173.bufferY[var18] = var5; + var18 = var18 + 1 & 4095; + class173.directions[var16 + 1][var17] = 8; + class173.distances[var16 + 1][var17] = var15; + } + + if (var17 > 0 && class173.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { + class173.bufferX[var18] = var4; + class173.bufferY[var18] = var5 - 1; + var18 = var18 + 1 & 4095; + class173.directions[var16][var17 - 1] = 1; + class173.distances[var16][var17 - 1] = var15; + } + + if (var17 < 127 && class173.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { + class173.bufferX[var18] = var4; + class173.bufferY[var18] = var5 + 1; + var18 = var18 + 1 & 4095; + class173.directions[var16][var17 + 1] = 4; + class173.distances[var16][var17 + 1] = var15; + } + + if (var16 > 0 && var17 > 0 && class173.directions[var16 - 1][var17 - 1] == 0 && (var12[var13 - 1][var14 - 1] & 19136782) == 0 && (var12[var13 - 1][var14] & 19136776) == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { + class173.bufferX[var18] = var4 - 1; + class173.bufferY[var18] = var5 - 1; + var18 = var18 + 1 & 4095; + class173.directions[var16 - 1][var17 - 1] = 3; + class173.distances[var16 - 1][var17 - 1] = var15; + } + + if (var16 < 127 && var17 > 0 && class173.directions[var16 + 1][var17 - 1] == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0 && (var12[var13 + 1][var14] & 19136896) == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { + class173.bufferX[var18] = var4 + 1; + class173.bufferY[var18] = var5 - 1; + var18 = var18 + 1 & 4095; + class173.directions[var16 + 1][var17 - 1] = 9; + class173.distances[var16 + 1][var17 - 1] = var15; + } + + if (var16 > 0 && var17 < 127 && class173.directions[var16 - 1][var17 + 1] == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0 && (var12[var13 - 1][var14] & 19136776) == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { + class173.bufferX[var18] = var4 - 1; + class173.bufferY[var18] = var5 + 1; + var18 = var18 + 1 & 4095; + class173.directions[var16 - 1][var17 + 1] = 6; + class173.distances[var16 - 1][var17 + 1] = var15; + } + + if (var16 < 127 && var17 < 127 && class173.directions[var16 + 1][var17 + 1] == 0 && (var12[var13 + 1][var14 + 1] & 19136992) == 0 && (var12[var13 + 1][var14] & 19136896) == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { + class173.bufferX[var18] = var4 + 1; + class173.bufferY[var18] = var5 + 1; + var18 = var18 + 1 & 4095; + class173.directions[var16 + 1][var17 + 1] = 12; + class173.distances[var16 + 1][var17 + 1] = var15; + } + } + + class268.field3524 = var4; + class173.field2072 = var5; + return false; + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "(IS)I", + garbageValue = "255" + ) + public static int method157(int var0) { + return var0 >> 11 & 63; + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "(Llc;ILjava/lang/String;B)Ljava/lang/String;", + garbageValue = "47" + ) + static String method151(IterableNodeHashTable var0, int var1, String var2) { + if (var0 == null) { + return var2; + } else { + ObjectNode var3 = (ObjectNode)var0.get((long)var1); + return var3 == null ? var2 : (String)var3.obj; } } + + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "(Lhz;Lhz;III)Lko;", + garbageValue = "276339523" + ) + public static Font method160(AbstractArchive var0, AbstractArchive var1, int var2, int var3) { + return !HitSplatDefinition.method4586(var0, var2, var3) ? null : ChatChannel.method2270(var1.takeFile(var2, var3)); + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "(IS)J", + garbageValue = "-206" + ) + public static long method152(int var0) { + return ViewportMouse.ViewportMouse_entityTags[var0]; + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "349411757" + ) + public static void method155() { + PlayerAppearance.PlayerAppearance_cachedModels.clear(); + } + + @ObfuscatedName("gy") + @ObfuscatedSignature( + signature = "(Lbn;ZI)V", + garbageValue = "558782767" + ) + @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 = KeyHandler.calculateTag(0, 0, 0, false, var0.index); + if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { + var0.isUnanimated = false; + var0.tileHeight = ScriptEvent.getTileHeight(var0.x, var0.y, UrlRequest.Client_plane); + var0.playerCycle = Client.cycle; + scene.addNullableObject(UrlRequest.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.field605, var0.field606, var0.field607, var0.field608); + } else { + if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { + if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { + return; + } + + Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; + } + + var0.tileHeight = ScriptEvent.getTileHeight(var0.x, var0.y, UrlRequest.Client_plane); + var0.playerCycle = Client.cycle; + scene.drawEntity(UrlRequest.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); + } + } + } + + } } diff --git a/runescape-client/src/main/java/class146.java b/runescape-client/src/main/java/class146.java deleted file mode 100644 index 8a2e3a4667..0000000000 --- a/runescape-client/src/main/java/class146.java +++ /dev/null @@ -1,7 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("ex") -public interface class146 { - @ObfuscatedName("u") - void method3382(Object var1); -} diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java index 17818d7596..350b4b1f96 100644 --- a/runescape-client/src/main/java/class16.java +++ b/runescape-client/src/main/java/class16.java @@ -1,501 +1,105 @@ +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("c") +@ObfuscatedName("t") public class class16 { - @ObfuscatedName("ai") - @ObfuscatedSignature( - signature = "(ILci;ZB)I", - garbageValue = "1" + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -367363475 ) - static int method195(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.FRIEND_COUNT) { - if (VertexNormal.friendSystem.field1061 == 0) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -2; - } else if (VertexNormal.friendSystem.field1061 == 1) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = VertexNormal.friendSystem.friendsList.getSize(); - } + @Export("musicTrackGroupId") + static int musicTrackGroupId; + @ObfuscatedName("ly") + @ObfuscatedSignature( + signature = "Lha;" + ) + @Export("mousedOverWidgetIf1") + static Widget mousedOverWidgetIf1; - return 1; + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(IIII)Lcu;", + garbageValue = "1224179540" + ) + @Export("getWorldMapScript") + static Script getWorldMapScript(int var0, int var1, int var2) { + int var3 = WorldMapDecorationType.method4085(var1, var0); + Script var5 = (Script)Script.Script_cached.get((long)(var3 << 16)); + Script var4; + if (var5 != null) { + var4 = var5; } else { - int var3; - if (var0 == ScriptOpcodes.FRIEND_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - if (VertexNormal.friendSystem.method1870() && var3 >= 0 && var3 < VertexNormal.friendSystem.friendsList.getSize()) { - Friend var8 = (Friend)VertexNormal.friendSystem.friendsList.get(var3); - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var8.getName(); - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var8.getPreviousName(); - } else { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - if (VertexNormal.friendSystem.method1870() && var3 >= 0 && var3 < VertexNormal.friendSystem.friendsList.getSize()) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = ((Buddy)VertexNormal.friendSystem.friendsList.get(var3)).world; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - if (VertexNormal.friendSystem.method1870() && var3 >= 0 && var3 < VertexNormal.friendSystem.friendsList.getSize()) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = ((Buddy)VertexNormal.friendSystem.friendsList.get(var3)).rank; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - } - - return 1; + String var6 = String.valueOf(var3); + int var7 = SoundSystem.archive12.getGroupId(var6); + if (var7 == -1) { + var4 = null; } else { - String var5; - if (var0 == ScriptOpcodes.FRIEND_SETRANK) { - var5 = Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]; - int var6 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - class216.method4118(var5, var6); - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_ADD) { - var5 = Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]; - VertexNormal.friendSystem.addFriend(var5); - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_DEL) { - var5 = Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]; - VertexNormal.friendSystem.removeFriend(var5); - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_ADD) { - var5 = Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]; - VertexNormal.friendSystem.addIgnore(var5); - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_DEL) { - var5 = Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]; - VertexNormal.friendSystem.removeIgnore(var5); - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_TEST) { - var5 = Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]; - var5 = VertexNormal.method3017(var5); - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = VertexNormal.friendSystem.isFriended(new Username(var5, WorldMapLabelSize.loginType), false) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { - if (InterfaceParent.clanChat != null) { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = InterfaceParent.clanChat.name; - } else { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; - } + label56: { + byte[] var8 = SoundSystem.archive12.takeFileFlat(var7); + if (var8 != null) { + if (var8.length <= 1) { + var4 = null; + break label56; + } - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { - if (InterfaceParent.clanChat != null) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = InterfaceParent.clanChat.getSize(); - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - if (InterfaceParent.clanChat != null && var3 < InterfaceParent.clanChat.getSize()) { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = InterfaceParent.clanChat.get(var3).getUsername().getName(); - } else { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - if (InterfaceParent.clanChat != null && var3 < InterfaceParent.clanChat.getSize()) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = ((Buddy)InterfaceParent.clanChat.get(var3)).getWorld(); - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - if (InterfaceParent.clanChat != null && var3 < InterfaceParent.clanChat.getSize()) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = ((Buddy)InterfaceParent.clanChat.get(var3)).rank; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = InterfaceParent.clanChat != null ? InterfaceParent.clanChat.minKick : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { - var5 = Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]; - UserComparator3.clanKickUser(var5); - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = InterfaceParent.clanChat != null ? InterfaceParent.clanChat.rank : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { - var5 = Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]; - WorldMapAreaData.Clan_joinChat(var5); - return 1; - } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { - class290.Clan_leaveChat(); - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { - if (!VertexNormal.friendSystem.method1870()) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = VertexNormal.friendSystem.ignoreList.getSize(); - } - - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - if (VertexNormal.friendSystem.method1870() && var3 >= 0 && var3 < VertexNormal.friendSystem.ignoreList.getSize()) { - Ignored var4 = (Ignored)VertexNormal.friendSystem.ignoreList.get(var3); - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var4.getName(); - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var4.getPreviousName(); - } else { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_TEST) { - var5 = Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]; - var5 = VertexNormal.method3017(var5); - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = VertexNormal.friendSystem.isIgnored(new Username(var5, WorldMapLabelSize.loginType)) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - if (InterfaceParent.clanChat != null && var3 < InterfaceParent.clanChat.getSize() && InterfaceParent.clanChat.get(var3).getUsername().equals(class215.localPlayer.username)) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { - if (InterfaceParent.clanChat != null && InterfaceParent.clanChat.owner != null) { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = InterfaceParent.clanChat.owner; - } else { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - if (InterfaceParent.clanChat != null && var3 < InterfaceParent.clanChat.getSize() && ((ClanMate)InterfaceParent.clanChat.get(var3)).isFriend()) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) { - if (var0 == 3628) { - VertexNormal.friendSystem.friendsList.removeComparator(); - return 1; - } else { - boolean var7; - if (var0 == 3629) { - var7 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - VertexNormal.friendSystem.friendsList.addComparator(new UserComparator1(var7)); - return 1; - } else if (var0 == 3630) { - var7 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - VertexNormal.friendSystem.friendsList.addComparator(new UserComparator2(var7)); - return 1; - } else if (var0 == 3631) { - var7 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - VertexNormal.friendSystem.friendsList.addComparator(new UserComparator3(var7)); - return 1; - } else if (var0 == 3632) { - var7 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - VertexNormal.friendSystem.friendsList.addComparator(new UserComparator4(var7)); - return 1; - } else if (var0 == 3633) { - var7 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - VertexNormal.friendSystem.friendsList.addComparator(new UserComparator5(var7)); - return 1; - } else if (var0 == 3634) { - var7 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - VertexNormal.friendSystem.friendsList.addComparator(new UserComparator6(var7)); - return 1; - } else if (var0 == 3635) { - var7 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - VertexNormal.friendSystem.friendsList.addComparator(new UserComparator7(var7)); - return 1; - } else if (var0 == 3636) { - var7 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - VertexNormal.friendSystem.friendsList.addComparator(new UserComparator8(var7)); - return 1; - } else if (var0 == 3637) { - var7 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - VertexNormal.friendSystem.friendsList.addComparator(new UserComparator9(var7)); - return 1; - } else if (var0 == 3638) { - var7 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - VertexNormal.friendSystem.friendsList.addComparator(new UserComparator10(var7)); - return 1; - } else if (var0 == 3639) { - VertexNormal.friendSystem.friendsList.sort(); - return 1; - } else if (var0 == 3640) { - VertexNormal.friendSystem.ignoreList.removeComparator(); - return 1; - } else if (var0 == 3641) { - var7 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - VertexNormal.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); - return 1; - } else if (var0 == 3642) { - var7 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - VertexNormal.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); - return 1; - } else if (var0 == 3643) { - VertexNormal.friendSystem.ignoreList.sort(); - return 1; - } else if (var0 == 3644) { - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.removeComparator(); - } - - return 1; - } else if (var0 == 3645) { - var7 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.addComparator(new UserComparator1(var7)); - } - - return 1; - } else if (var0 == 3646) { - var7 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.addComparator(new UserComparator2(var7)); - } - - return 1; - } else if (var0 == 3647) { - var7 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.addComparator(new UserComparator3(var7)); - } - - return 1; - } else if (var0 == 3648) { - var7 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.addComparator(new UserComparator4(var7)); - } - - return 1; - } else if (var0 == 3649) { - var7 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.addComparator(new UserComparator5(var7)); - } - - return 1; - } else if (var0 == 3650) { - var7 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.addComparator(new UserComparator6(var7)); - } - - return 1; - } else if (var0 == 3651) { - var7 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.addComparator(new UserComparator7(var7)); - } - - return 1; - } else if (var0 == 3652) { - var7 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.addComparator(new UserComparator8(var7)); - } - - return 1; - } else if (var0 == 3653) { - var7 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.addComparator(new UserComparator9(var7)); - } - - return 1; - } else if (var0 == 3654) { - var7 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.addComparator(new UserComparator10(var7)); - } - - return 1; - } else if (var0 == 3655) { - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.sort(); - } - - return 1; - } else if (var0 == 3656) { - var7 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - VertexNormal.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); - return 1; - } else if (var0 == 3657) { - var7 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.addComparator(new BuddyRankComparator(var7)); - } - - return 1; - } else { - return 2; + var5 = Tiles.newScript(var8); + if (var5 != null) { + Script.Script_cached.put(var5, (long)(var3 << 16)); + var4 = var5; + break label56; } } - } else { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - if (InterfaceParent.clanChat != null && var3 < InterfaceParent.clanChat.getSize() && ((ClanMate)InterfaceParent.clanChat.get(var3)).isIgnored()) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - } - return 1; + var4 = null; } } } - } - @ObfuscatedName("ar") - @ObfuscatedSignature( - signature = "(ILci;ZI)I", - garbageValue = "1316998037" - ) - static int method196(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - int var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - if (!Client.isCameraLocked) { - Client.camAngleX = var3; - Client.camAngleY = var4; - } - - return 1; - } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.camAngleX; - return 1; - } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.camAngleY; - return 1; - } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - if (var3 < 0) { - var3 = 0; - } - - Client.camFollowHeight = var3; - return 1; - } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.camFollowHeight; - return 1; + if (var4 != null) { + return var4; } else { - return 2; - } - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - signature = "(ILci;ZB)I", - garbageValue = "-33" - ) - static int method197(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - Client.field880 = (short)WorldMapIcon_1.method309(Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]); - if (Client.field880 <= 0) { - Client.field880 = 256; - } - - Client.field893 = (short)WorldMapIcon_1.method309(Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]); - if (Client.field893 <= 0) { - Client.field893 = 256; - } - - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - Client.zoomHeight = (short)Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - if (Client.zoomHeight <= 0) { - Client.zoomHeight = 256; - } - - Client.zoomWidth = (short)Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - if (Client.zoomWidth <= 0) { - Client.zoomWidth = 320; - } - - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 4; - Client.field896 = (short)Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - if (Client.field896 <= 0) { - Client.field896 = 1; - } - - Client.field897 = (short)Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - if (Client.field897 <= 0) { - Client.field897 = 32767; - } else if (Client.field897 < Client.field896) { - Client.field897 = Client.field896; - } - - Client.field785 = (short)Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 2]; - if (Client.field785 <= 0) { - Client.field785 = 1; - } - - Client.field679 = (short)Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 3]; - if (Client.field679 <= 0) { - Client.field679 = 32767; - } else if (Client.field679 < Client.field785) { - Client.field679 = Client.field785; - } - - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { - if (Client.viewportWidget != null) { - FileSystem.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.viewportWidth; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.viewportHeight; + int var12 = (var2 + 40000 << 8) + var0; + Script var14 = (Script)Script.Script_cached.get((long)(var12 << 16)); + Script var13; + if (var14 != null) { + var13 = var14; } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1; + String var9 = String.valueOf(var12); + int var10 = SoundSystem.archive12.getGroupId(var9); + if (var10 == -1) { + var13 = null; + } else { + byte[] var11 = SoundSystem.archive12.takeFileFlat(var10); + if (var11 != null) { + if (var11.length <= 1) { + var13 = null; + return var13 != null ? var13 : null; + } + + var14 = Tiles.newScript(var11); + if (var14 != null) { + Script.Script_cached.put(var14, (long)(var12 << 16)); + var13 = var14; + return var13 != null ? var13 : null; + } + } + + var13 = null; + } } - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.zoomHeight; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.zoomWidth; - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = FileSystem.method3551(Client.field880); - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = FileSystem.method3551(Client.field893); - return 1; - } else if (var0 == 6220) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 6221) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 6222) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = BoundaryObject.canvasWidth; - return 1; - } else if (var0 == 6223) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = WorldMapCacheName.canvasHeight; - return 1; - } else { - return 2; + return var13 != null ? var13 : null; } } + + @ObfuscatedName("b") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "1669945639" + ) + public static void method179() { + ParamDefinition.ParamDefinition_cached.clear(); + } } diff --git a/runescape-client/src/main/java/class160.java b/runescape-client/src/main/java/class160.java index eab2bb80cb..a8a285ad3f 100644 --- a/runescape-client/src/main/java/class160.java +++ b/runescape-client/src/main/java/class160.java @@ -3,50 +3,50 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fx") +@ObfuscatedName("fv") public enum class160 implements Enumerated { - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lfx;" - ) - field2009(1, 0), @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lfx;" + signature = "Lfv;" ) - field2008(0, 1), - @ObfuscatedName("b") + field1988(2, 0), + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lfx;" + signature = "Lfv;" ) - field2006(3, 2), - @ObfuscatedName("g") + field1984(1, 1), + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lfx;" + signature = "Lfv;" ) - field2005(2, 3); + field1985(3, 2), + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "Lfv;" + ) + field1986(0, 3); - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -406777895 - ) - public final int field2007; @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -141760123 + intValue = -410013457 + ) + public final int field1987; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -1136729991 ) @Export("id") final int id; class160(int var3, int var4) { - this.field2007 = var3; + this.field1987 = var3; this.id = var4; } - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "7" + garbageValue = "-57" ) @Export("rsOrdinal") public int rsOrdinal() { @@ -55,48 +55,17 @@ public enum class160 implements Enumerated { @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "684662102" + signature = "(Lkq;II)V", + garbageValue = "1384182754" ) - @Export("iLog") - public static int iLog(int var0) { - int var1 = 0; - if (var0 < 0 || var0 >= 65536) { - var0 >>>= 16; - var1 += 16; + public static void method3432(Buffer var0, int var1) { + if (JagexCache.JagexCache_randomDat != null) { + try { + JagexCache.JagexCache_randomDat.seek(0L); + JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); + } catch (Exception var3) { + } } - 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("ja") - @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "7" - ) - static final void method3494(int var0) { - if (UserComparator3.loadInterface(var0)) { - MusicPatchPcmStream.drawModelComponents(FloorDecoration.Widget_interfaceComponents[var0], -1); - } } } diff --git a/runescape-client/src/main/java/class161.java b/runescape-client/src/main/java/class161.java index 6a8e124835..35459ea2a9 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("fm") +@ObfuscatedName("fo") public interface class161 { } diff --git a/runescape-client/src/main/java/class162.java b/runescape-client/src/main/java/class162.java index 31d1498da9..1166b00d83 100644 --- a/runescape-client/src/main/java/class162.java +++ b/runescape-client/src/main/java/class162.java @@ -2,108 +2,28 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fc") +@ObfuscatedName("fq") public class class162 implements class161 { - @ObfuscatedName("dm") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lij;" + signature = "[Lbe;" ) - @Export("archive14") - static Archive archive14; - - @ObfuscatedName("fm") + @Export("World_worlds") + static World[] World_worlds; + @ObfuscatedName("gl") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "45" + signature = "[Lli;" ) - @Export("getLoginError") - static void getLoginError(int var0) { - if (var0 == -3) { - PacketWriter.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); - } else if (var0 == -2) { - PacketWriter.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); - } else if (var0 == -1) { - PacketWriter.setLoginResponseString("No response from server.", "Please try using a different world.", ""); - } else if (var0 == 3) { - Login.loginIndex = 3; - Login.field1186 = 1; - } else if (var0 == 4) { - Login.loginIndex = 12; - Login.field1185 = 0; - } else if (var0 == 5) { - Login.field1186 = 2; - PacketWriter.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) { - PacketWriter.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); - } else if (var0 == 7) { - PacketWriter.setLoginResponseString("This world is full.", "Please use a different world.", ""); - } else if (var0 == 8) { - PacketWriter.setLoginResponseString("Unable to connect.", "Login server offline.", ""); - } else if (var0 == 9) { - PacketWriter.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); - } else if (var0 == 10) { - PacketWriter.setLoginResponseString("Unable to connect.", "Bad session id.", ""); - } else if (var0 == 11) { - PacketWriter.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); - } else if (var0 == 12) { - PacketWriter.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); - } else if (var0 == 13) { - PacketWriter.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); - } else if (var0 == 14) { - PacketWriter.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 16) { - PacketWriter.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", ""); - } else if (var0 == 17) { - PacketWriter.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.field1185 = 1; - } else if (var0 == 19) { - PacketWriter.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); - } else if (var0 == 20) { - PacketWriter.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); - } else if (var0 == 22) { - PacketWriter.setLoginResponseString("Malformed login packet.", "Please try again.", ""); - } else if (var0 == 23) { - PacketWriter.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 24) { - PacketWriter.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); - } else if (var0 == 25) { - PacketWriter.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); - } else if (var0 == 26) { - PacketWriter.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); - } else if (var0 == 27) { - PacketWriter.setLoginResponseString("", "Service unavailable.", ""); - } else if (var0 == 31) { - PacketWriter.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) { - PacketWriter.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) { - PacketWriter.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); - } else if (var0 == 38) { - PacketWriter.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) { - PacketWriter.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); - class81.updateGameState(11); - return; - } + @Export("mapSceneSprites") + static IndexedSprite[] mapSceneSprites; - if (var0 == 57) { - PacketWriter.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); - class81.updateGameState(11); - return; - } - - if (var0 == 61) { - Login.loginIndex = 7; - } else { - PacketWriter.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); - } - } - - class81.updateGameState(10); + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "(B)[Lfw;", + garbageValue = "-63" + ) + @Export("ServerPacket_values") + public static ServerPacket[] ServerPacket_values() { + return new ServerPacket[]{ServerPacket.field2120, ServerPacket.field2087, ServerPacket.field2088, ServerPacket.field2144, ServerPacket.field2090, ServerPacket.field2091, ServerPacket.field2142, ServerPacket.field2140, ServerPacket.field2094, ServerPacket.field2095, ServerPacket.field2096, ServerPacket.field2097, ServerPacket.field2098, ServerPacket.field2163, ServerPacket.field2159, ServerPacket.field2101, ServerPacket.field2149, ServerPacket.field2173, ServerPacket.field2104, ServerPacket.field2105, ServerPacket.field2106, ServerPacket.field2138, ServerPacket.field2108, ServerPacket.field2109, ServerPacket.field2110, ServerPacket.field2162, ServerPacket.field2112, ServerPacket.field2113, ServerPacket.field2114, ServerPacket.field2089, ServerPacket.field2116, ServerPacket.field2100, ServerPacket.field2118, ServerPacket.field2119, ServerPacket.field2093, ServerPacket.field2121, ServerPacket.field2122, ServerPacket.field2129, ServerPacket.field2124, ServerPacket.field2125, ServerPacket.field2126, ServerPacket.field2127, ServerPacket.field2128, ServerPacket.field2164, ServerPacket.field2130, ServerPacket.field2153, ServerPacket.field2132, ServerPacket.field2111, ServerPacket.field2134, ServerPacket.field2135, ServerPacket.field2136, ServerPacket.field2161, ServerPacket.field2131, ServerPacket.field2139, ServerPacket.field2123, ServerPacket.field2141, ServerPacket.field2137, ServerPacket.field2143, ServerPacket.field2102, ServerPacket.field2145, ServerPacket.field2146, ServerPacket.field2147, ServerPacket.field2148, ServerPacket.field2169, ServerPacket.field2170, ServerPacket.field2151, ServerPacket.field2152, ServerPacket.field2133, ServerPacket.field2154, ServerPacket.field2155, ServerPacket.field2156, ServerPacket.field2157, ServerPacket.field2158, ServerPacket.field2150, ServerPacket.field2160, ServerPacket.field2099, ServerPacket.field2086, ServerPacket.field2117, ServerPacket.field2115, ServerPacket.field2165, ServerPacket.field2166, ServerPacket.field2167, ServerPacket.field2168, ServerPacket.field2092, ServerPacket.field2107, ServerPacket.field2171}; } } diff --git a/runescape-client/src/main/java/class173.java b/runescape-client/src/main/java/class173.java index 9b09ae4978..0e05d6c9bd 100644 --- a/runescape-client/src/main/java/class173.java +++ b/runescape-client/src/main/java/class173.java @@ -1,32 +1,35 @@ +import java.io.File; +import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fy") +@ObfuscatedName("ft") public class class173 { - @ObfuscatedName("b") - @Export("directions") - static int[][] directions; - @ObfuscatedName("g") - @Export("distances") - static int[][] distances; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -1442430251 - ) - static int field2103; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -101086935 - ) - static int field2100; @ObfuscatedName("y") - @Export("bufferX") - static int[] bufferX; + @Export("directions") + public static int[][] directions; @ObfuscatedName("w") + @Export("distances") + public static int[][] distances; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -1981163643 + ) + public static int field2072; + @ObfuscatedName("x") + @Export("bufferX") + public static int[] bufferX; + @ObfuscatedName("a") @Export("bufferY") - static int[] bufferY; + public static int[] bufferY; + @ObfuscatedName("ca") + @ObfuscatedSignature( + signature = "Lbo;" + ) + @Export("mouseRecorder") + static MouseRecorder mouseRecorder; static { directions = new int[128][128]; @@ -35,13 +38,62 @@ public class class173 { bufferY = new int[4096]; } - @ObfuscatedName("bi") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)I", - garbageValue = "826703684" + signature = "(Lhz;IIIZI)V", + garbageValue = "1828345963" ) - @Export("stringCp1252NullTerminatedByteSize") - public static int stringCp1252NullTerminatedByteSize(String var0) { - return var0.length() + 1; + @Export("playMusicTrack") + public static void playMusicTrack(AbstractArchive var0, int var1, int var2, int var3, boolean var4) { + class197.field2392 = 1; + Coord.musicTrackArchive = var0; + class16.musicTrackGroupId = var1; + GrandExchangeOffer.musicTrackFileId = var2; + class197.musicTrackVolume = var3; + WorldMapDecoration.musicTrackBoolean = var4; + ParamDefinition.field3275 = 10000; + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "(Ljava/io/File;ZI)Z", + garbageValue = "969136252" + ) + static boolean method3561(File var0, boolean var1) { + try { + RandomAccessFile var2 = new RandomAccessFile(var0, "rw"); + int var3 = var2.read(); + var2.seek(0L); + var2.write(var3); + var2.seek(0L); + var2.close(); + if (var1) { + var0.delete(); + } + + return true; + } catch (Exception var4) { + return false; + } + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-974427465" + ) + public static void method3560() { + while (true) { + ArchiveDiskAction var0; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + var0 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); + } + + if (var0 == null) { + return; + } + + var0.archive.load(var0.archiveDisk, (int)var0.key, var0.data, false); + } } } diff --git a/runescape-client/src/main/java/class181.java b/runescape-client/src/main/java/class181.java deleted file mode 100644 index 91a32c4bed..0000000000 --- a/runescape-client/src/main/java/class181.java +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index 43422da204..0000000000 --- a/runescape-client/src/main/java/class185.java +++ /dev/null @@ -1,135 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("gd") -public class class185 { - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lgd;" - ) - public static final class185 field2334; - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "Lgd;" - ) - public static final class185 field2332; - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "Lgd;" - ) - public static final class185 field2333; - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "Lgd;" - ) - public static final class185 field2339; - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "Lgd;" - ) - public static final class185 field2336; - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lgd;" - ) - public static final class185 field2341; - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "Lgd;" - ) - public static final class185 field2337; - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "Lgd;" - ) - public static final class185 field2331; - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lgd;" - ) - public static final class185 field2335; - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Lgd;" - ) - public static final class185 field2340; - @ObfuscatedName("lh") - @ObfuscatedSignature( - signature = "Lhl;" - ) - @Export("mousedOverWidgetIf1") - static Widget mousedOverWidgetIf1; - - static { - field2334 = new class185(5); - field2332 = new class185(4); - field2333 = new class185(14); - field2339 = new class185(3); - field2336 = new class185(15); - field2341 = new class185(6); - field2337 = new class185(4); - field2331 = new class185(7); - field2335 = new class185(5); - field2340 = new class185(2); - } - - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "5" - ) - class185(int var1) { - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(Lhf;B)V", - garbageValue = "3" - ) - public static void method3665(AbstractArchive var0) { - VarbitDefinition.VarbitDefinition_archive = var0; - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "(Lhf;IB)Llm;", - garbageValue = "-1" - ) - public static IndexedSprite method3669(AbstractArchive var0, int var1) { - byte[] var3 = var0.takeFileFlat(var1); - boolean var2; - if (var3 == null) { - var2 = false; - } else { - Buffer.SpriteBuffer_decode(var3); - var2 = true; - } - - return !var2 ? null : GrandExchangeOfferAgeComparator.method172(); - } - - @ObfuscatedName("ka") - @ObfuscatedSignature( - signature = "(IIIILln;Lhn;I)V", - garbageValue = "1250322878" - ) - @Export("drawSpriteOnMinimap") - static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) { - if (var4 != null) { - int var6 = Client.camAngleY & 2047; - int var7 = var3 * var3 + var2 * var2; - if (var7 <= 6400) { - int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; - int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; - int var10 = var3 * var8 + var9 * var2 >> 16; - int var11 = var3 * var9 - var8 * var2 >> 16; - if (var7 > 2500) { - var4.method6223(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/class186.java b/runescape-client/src/main/java/class186.java deleted file mode 100644 index c10fda1632..0000000000 --- a/runescape-client/src/main/java/class186.java +++ /dev/null @@ -1,11 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("gs") -public class class186 { - @ObfuscatedName("ab") - @ObfuscatedSignature( - signature = "Llw;" - ) - static Bounds field2342; -} diff --git a/runescape-client/src/main/java/class188.java b/runescape-client/src/main/java/class188.java index 2d48016ab2..560ca6a2bc 100644 --- a/runescape-client/src/main/java/class188.java +++ b/runescape-client/src/main/java/class188.java @@ -1,43 +1,40 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gh") +@ObfuscatedName("gq") public class class188 { - @ObfuscatedName("u") - static int[] field2353; - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "Lhl;" + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 1663251439 ) - static Widget field2352; + @Export("Interpreter_intStackSize") + static int Interpreter_intStackSize; + @ObfuscatedName("bq") + @ObfuscatedSignature( + signature = "Lll;" + ) + @Export("loginType") + static LoginType loginType; - static { - new Object(); - field2353 = new int[33]; - field2353[0] = 0; - int var0 = 2; - - for (int var1 = 1; var1 < 33; ++var1) { - field2353[var1] = var0 - 1; - var0 += var0; + @ObfuscatedName("i") + static final void method3604(long var0) { + try { + Thread.sleep(var0); + } catch (InterruptedException var3) { } } - @ObfuscatedName("w") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "470925087" + signature = "(ZZB)I", + garbageValue = "1" ) - static final int method3692(int var0, int var1) { - int var2 = RouteStrategy.method3640(45365 + var0, 91923 + var1, 4) - 128 + (RouteStrategy.method3640(var0 + 10294, var1 + 37821, 2) - 128 >> 1) + (RouteStrategy.method3640(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; + public static int method3601(boolean var0, boolean var1) { + byte var2 = 0; + int var3 = var2 + NetCache.NetCache_pendingPriorityResponsesCount + NetCache.NetCache_pendingPriorityWritesCount; + return var3; } } diff --git a/runescape-client/src/main/java/class189.java b/runescape-client/src/main/java/class189.java index 2f42dcacd2..0058c061ec 100644 --- a/runescape-client/src/main/java/class189.java +++ b/runescape-client/src/main/java/class189.java @@ -1,158 +1,54 @@ +import java.awt.Image; +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("gb") +@ObfuscatedName("gf") public class class189 { - @ObfuscatedName("x") + @ObfuscatedName("sb") @ObfuscatedGetter( - intValue = 14888665 + intValue = -1002742885 ) - static int field2355; + @Export("foundItemIndex") + static int foundItemIndex; + @ObfuscatedName("f") + static int[] field2331; + @ObfuscatedName("ao") + static Image field2333; + + static { + new Object(); + field2331 = new int[33]; + field2331[0] = 0; + int var0 = 2; + + for (int var1 = 1; var1 < 33; ++var1) { + field2331[var1] = var0 - 1; + var0 += var0; + } - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "-557441008" - ) - public static boolean method3699(int var0) { - return (var0 >> 31 & 1) != 0; } - @ObfuscatedName("y") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(ILci;ZI)I", - garbageValue = "-474023245" + signature = "(I)V", + garbageValue = "-567890341" ) - static int method3698(int var0, Script var1, boolean var2) { - boolean var3 = true; - Widget var4; - if (var0 >= 2000) { - var0 -= 1000; - var4 = Language.getWidget(Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]); - var3 = false; - } else { - var4 = var2 ? Interpreter.field1090 : class188.field2352; - } + public static void method3623() { + ObjectDefinition.ObjectDefinition_cached.clear(); + ObjectDefinition.ObjectDefinition_cachedModelData.clear(); + ObjectDefinition.ObjectDefinition_cachedEntities.clear(); + ObjectDefinition.ObjectDefinition_cachedModels.clear(); + } - int var11; - if (var0 == ScriptOpcodes.CC_SETOP) { - var11 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] - 1; - if (var11 >= 0 && var11 <= 9) { - var4.setAction(var11, Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]); - return 1; - } else { - --class43.Interpreter_stringStackSize; - return 1; - } - } else { - int var6; - if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var11 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var6 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - var4.parent = UserComparator3.getWidgetChild(var11, var6); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { - var4.isScrollBar = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { - var4.dragZoneSize = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { - var4.dragThreshold = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { - var4.dataText = Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { - var4.spellActionName = Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { - var4.actions = null; - return 1; - } else if (var0 == 1308) { - var4.field2719 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1; - return 1; - } else { - int var7; - byte[] var9; - if (var0 != ScriptOpcodes.CC_SETOPKEY) { - byte var5; - if (var0 == ScriptOpcodes.CC_SETOPTKEY) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var5 = 10; - var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]}; - byte[] var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]}; - WorldMapSectionType.Widget_setKey(var4, var5, var9, var10); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 3; - var11 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] - 1; - var6 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - var7 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 2]; - if (var11 >= 0 && var11 <= 9) { - class4.Widget_setKeyRate(var4, var11, var6, var7); - return 1; - } else { - throw new RuntimeException(); - } - } else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { - var5 = 10; - var6 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var7 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - class4.Widget_setKeyRate(var4, var5, var6, var7); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { - --GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize; - var11 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] - 1; - if (var11 >= 0 && var11 <= 9) { - class215.Widget_setKeyIgnoreHeld(var4, var11); - return 1; - } else { - throw new RuntimeException(); - } - } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { - var5 = 10; - class215.Widget_setKeyIgnoreHeld(var4, var5); - return 1; - } else { - return 2; - } - } else { - byte[] var8 = null; - var9 = null; - if (var3) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 10; - - for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + GrandExchangeOfferTotalQuantityComparator.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 + GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var9[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - } - } - } else { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]}; - var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]}; - } - - var7 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] - 1; - if (var7 >= 0 && var7 <= 9) { - WorldMapSectionType.Widget_setKey(var4, var7, var8, var9); - return 1; - } else { - throw new RuntimeException(); - } - } - } - } + @ObfuscatedName("la") + @ObfuscatedSignature( + signature = "(S)V", + garbageValue = "-32149" + ) + static void method3620() { + Client.packetWriter.addNode(class2.getPacketBufferNode(ClientPacket.field2226, Client.packetWriter.isaacCipher)); + Client.oculusOrbState = 0; } } diff --git a/runescape-client/src/main/java/class191.java b/runescape-client/src/main/java/class191.java index 21171cbe6b..67959307be 100644 --- a/runescape-client/src/main/java/class191.java +++ b/runescape-client/src/main/java/class191.java @@ -1,154 +1,170 @@ -import java.awt.Desktop; -import java.awt.Desktop.Action; -import java.io.File; -import java.io.IOException; -import java.net.URI; import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gw") +@ObfuscatedName("gd") public class class191 { - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lgw;" - ) - static final class191 field2376; @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lgw;" + signature = "Lgd;" ) - static final class191 field2372; - @ObfuscatedName("b") + static final class191 field2354; + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lgw;" + signature = "Lgd;" ) - static final class191 field2375; - @ObfuscatedName("kc") - @ObfuscatedGetter( - intValue = 124291179 + static final class191 field2350; + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "Lgd;" ) - @Export("menuY") - static int menuY; + static final class191 field2352; static { - field2376 = new class191(); - field2372 = new class191(); - field2375 = new class191(); + field2354 = new class191(); + field2350 = new class191(); + field2352 = new class191(); } class191() { } - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;ZI)Lmd;", - garbageValue = "-1138892268" - ) - @Export("getPreferencesFile") - public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { - File var3 = new File(UserComparator2.cacheDir, "preferences" + var0 + ".dat"); - if (var3.exists()) { - try { - AccessFile var10 = new AccessFile(var3, "rw", 10000L); - return var10; - } catch (IOException var9) { - } - } - - String var4 = ""; - if (PendingSpawn.cacheGamebuild == 33) { - var4 = "_rc"; - } else if (PendingSpawn.cacheGamebuild == 34) { - var4 = "_wip"; - } - - File var5 = new File(JagexCache.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("f") @ObfuscatedSignature( - signature = "(Ljava/lang/String;ZLjava/lang/String;ZB)V", - garbageValue = "0" + signature = "(II)Lix;", + garbageValue = "-2115403746" ) - static void method3721(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.field424.startsWith("win") && !var3) { - GraphicsObject.method2040(var0, 0); - return; - } - - if (class51.field424.startsWith("mac")) { - class237.method4422(var0, 1, var2); - return; - } - - GraphicsObject.method2040(var0, 2); + @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 { - GraphicsObject.method2040(var0, 3); + byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); + var1 = new KitDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + KitDefinition.KitDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(Lbj;I)V", + garbageValue = "-1644977095" + ) + static void method3638(GameShell var0) { + while (KeyHandler.isKeyDown()) { + if (VertexNormal.field1732 == 13) { + Login.worldSelectOpen = false; + UrlRequest.leftTitleSprite.drawAt(Login.xPadding, 0); + ScriptFrame.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); + return; + } + + if (VertexNormal.field1732 == 96) { + if (Login.worldSelectPage > 0 && GrandExchangeEvent.worldSelectLeftSprite != null) { + --Login.worldSelectPage; + } + } else if (VertexNormal.field1732 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && UserList.worldSelectRightSprite != null) { + ++Login.worldSelectPage; + } + } + + if (MouseHandler.MouseHandler_lastButton == 1 || !NetFileRequest.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { + int var1 = Login.xPadding + 280; + if (MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + PcmPlayer.changeWorldSelectSorting(0, 0); + return; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + PcmPlayer.changeWorldSelectSorting(0, 1); + return; + } + + int var2 = Login.xPadding + 390; + if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + PcmPlayer.changeWorldSelectSorting(1, 0); + return; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + PcmPlayer.changeWorldSelectSorting(1, 1); + return; + } + + int var3 = Login.xPadding + 500; + if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + PcmPlayer.changeWorldSelectSorting(2, 0); + return; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + PcmPlayer.changeWorldSelectSorting(2, 1); + return; + } + + int var4 = Login.xPadding + 610; + if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + PcmPlayer.changeWorldSelectSorting(3, 0); + return; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + PcmPlayer.changeWorldSelectSorting(3, 1); + return; + } + + if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { + Login.worldSelectOpen = false; + UrlRequest.leftTitleSprite.drawAt(Login.xPadding, 0); + ScriptFrame.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); + return; + } + + if (Login.hoveredWorldIndex != -1) { + World var5 = class162.World_worlds[Login.hoveredWorldIndex]; + KeyHandler.changeWorld(var5); + Login.worldSelectOpen = false; + UrlRequest.leftTitleSprite.drawAt(Login.xPadding, 0); + ScriptFrame.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); + return; + } + + if (Login.worldSelectPage > 0 && GrandExchangeEvent.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= GrandExchangeEvent.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= AttackOption.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= AttackOption.canvasHeight / 2 + 50) { + --Login.worldSelectPage; + } + + if (Login.worldSelectPage < Login.worldSelectPagesCount && UserList.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= GrandExchangeOfferTotalQuantityComparator.canvasWidth - UserList.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= GrandExchangeOfferTotalQuantityComparator.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= AttackOption.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= AttackOption.canvasHeight / 2 + 50) { + ++Login.worldSelectPage; + } } } - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)Ljava/lang/String;", - garbageValue = "-1" + signature = "(CI)Z", + garbageValue = "-1025442048" ) - public static String method3720(String var0) { - int var1 = var0.length(); - char[] var2 = new char[var1]; - byte var3 = 2; + @Export("isAlphaNumeric") + public static boolean isAlphaNumeric(char var0) { + return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; + } - 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 = WorldMapElement.method4483(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("j") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;B)V", + garbageValue = "-13" + ) + static final void method3640(String var0) { + Tiles.method1143("Please remove " + var0 + " from your friend list first"); } } diff --git a/runescape-client/src/main/java/class192.java b/runescape-client/src/main/java/class192.java index 688ba62b76..cac5b6a9dd 100644 --- a/runescape-client/src/main/java/class192.java +++ b/runescape-client/src/main/java/class192.java @@ -1,274 +1,644 @@ -import java.lang.reflect.Field; -import java.lang.reflect.Method; import java.util.HashSet; import java.util.Set; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; -@ObfuscatedName("go") +@ObfuscatedName("gb") public enum class192 implements Enumerated { - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lgo;" - ) - field2381("", 0, new class191[]{class191.field2375}), @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lgo;" + signature = "Lgb;" ) - field2378("", 1, new class191[]{class191.field2372, class191.field2375}), - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "Lgo;" - ) - field2379("", 2, new class191[]{class191.field2372, class191.field2376, class191.field2375}), - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "Lgo;" - ) - field2392("", 3, new class191[]{class191.field2372}), - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "Lgo;" - ) - field2390("", 4), - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lgo;" - ) - field2384("", 5, new class191[]{class191.field2372, class191.field2375}), - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "Lgo;" - ) - field2383("", 6, new class191[]{class191.field2375}), - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "Lgo;" - ) - field2385("", 8, new class191[]{class191.field2372, class191.field2375}), - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lgo;" - ) - field2389("", 9, new class191[]{class191.field2372, class191.field2376}), + field2369("", 0, new class191[]{class191.field2352}), @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lgo;" + signature = "Lgb;" ) - field2386("", 10, new class191[]{class191.field2372}), - @ObfuscatedName("k") + field2358("", 1, new class191[]{class191.field2350, class191.field2352}), + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lgo;" + signature = "Lgb;" ) - field2387("", 11, new class191[]{class191.field2372}), + field2359("", 2, new class191[]{class191.field2350, class191.field2354, class191.field2352}), + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "Lgb;" + ) + field2360("", 3, new class191[]{class191.field2350}), + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "Lgb;" + ) + field2368("", 4), + @ObfuscatedName("b") + @ObfuscatedSignature( + signature = "Lgb;" + ) + field2362("", 5, new class191[]{class191.field2350, class191.field2352}), + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "Lgb;" + ) + field2363("", 6, new class191[]{class191.field2352}), @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lgo;" + signature = "Lgb;" ) - field2388("", 12, new class191[]{class191.field2372, class191.field2375}), + field2373("", 8, new class191[]{class191.field2350, class191.field2352}), + @ObfuscatedName("a") + @ObfuscatedSignature( + signature = "Lgb;" + ) + field2365("", 9, new class191[]{class191.field2350, class191.field2354}), + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "Lgb;" + ) + field2370("", 10, new class191[]{class191.field2350}), + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "Lgb;" + ) + field2367("", 11, new class191[]{class191.field2350}), @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lgo;" + signature = "Lgb;" ) - field2382("", 13, new class191[]{class191.field2372}); - - @ObfuscatedName("ah") - @ObfuscatedGetter( - intValue = 2041641327 - ) - static int field2395; - @ObfuscatedName("gf") + field2361("", 12, new class191[]{class191.field2350, class191.field2352}), + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "[Llm;" + signature = "Lgb;" ) - @Export("modIconSprites") - static IndexedSprite[] modIconSprites; - @ObfuscatedName("e") + field2364("", 13, new class191[]{class191.field2350}); + + @ObfuscatedName("ji") + @ObfuscatedSignature( + signature = "Lha;" + ) + static Widget field2372; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -130205167 + intValue = 1652165793 ) @Export("id") final int id; - @ObfuscatedName("n") - final Set field2391; + @ObfuscatedName("s") + final Set field2371; static { - method3733(); + method3643(); } @ObfuscatedSignature( - signature = "(Ljava/lang/String;I[Lgw;)V" + signature = "(Ljava/lang/String;I[Lgd;)V" ) class192(String var3, int var4, class191[] var5) { - this.field2391 = new HashSet(); + this.field2371 = new HashSet(); this.id = var4; class191[] var6 = var5; for (int var7 = 0; var7 < var6.length; ++var7) { class191 var8 = var6[var7]; - this.field2391.add(var8); + this.field2371.add(var8); } } class192(String var3, int var4) { - this.field2391 = new HashSet(); + this.field2371 = new HashSet(); this.id = var4; } - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "7" + garbageValue = "-57" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(I)[Lgo;", - garbageValue = "1222259750" + signature = "(I)[Lgb;", + garbageValue = "474493993" ) - static class192[] method3733() { - return new class192[]{field2383, field2379, field2392, field2388, field2387, field2384, field2385, field2378, field2386, field2390, field2389, field2382, field2381}; + static class192[] method3643() { + return new class192[]{field2369, field2365, field2360, field2359, field2364, field2363, field2370, field2358, field2361, field2373, field2368, field2367, field2362}; } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Lkg;IB)V", - garbageValue = "-107" + signature = "(I)I", + garbageValue = "1164904579" ) - @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][][]; + public static int method3654() { + return ViewportMouse.ViewportMouse_entityCount; + } - for (int var3 = 0; var3 < var2.size; ++var3) { - try { - int var4 = var0.readUnsignedByte(); - String var5; - String var6; - int var7; - if (var4 != 0 && var4 != 1 && var4 != 2) { - if (var4 == 3 || var4 == 4) { - var5 = var0.readStringCp1252NullTerminated(); - var6 = var0.readStringCp1252NullTerminated(); - var7 = var0.readUnsignedByte(); - String[] var8 = new String[var7]; + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "([Lbe;II[I[II)V", + garbageValue = "2064654352" + ) + @Export("sortWorlds") + static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) { + if (var1 < var2) { + int var5 = var1 - 1; + int var6 = var2 + 1; + int var7 = (var2 + var1) / 2; + World var8 = var0[var7]; + var0[var7] = var0[var1]; + var0[var1] = var8; - for (int var9 = 0; var9 < var7; ++var9) { - var8[var9] = var0.readStringCp1252NullTerminated(); - } + while (var5 < var6) { + boolean var9 = true; - 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); + 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; } - } - var2.operations[var3] = var4; - Class[] var21 = new Class[var7]; - - for (var12 = 0; var12 < var7; ++var12) { - var21[var12] = VarcInt.loadClassFromDescriptor(var8[var12]); - } - - Class var22 = VarcInt.loadClassFromDescriptor(var20); - if (VarcInt.loadClassFromDescriptor(var5).getClassLoader() == null) { - throw new SecurityException(); - } - - Method[] var13 = VarcInt.loadClassFromDescriptor(var5).getDeclaredMethods(); - Method[] var14 = var13; - - for (int var15 = 0; var15 < var14.length; ++var15) { - Method var16 = var14[var15]; - if (Reflection.getMethodName(var16).equals(var6)) { - Class[] var17 = Reflection.getParameterTypes(var16); - if (var21.length == var17.length) { - boolean var18 = true; - - for (int var19 = 0; var19 < var21.length; ++var19) { - if (var21[var19] != var17[var19]) { - var18 = false; - break; - } - } - - if (var18 && var22 == var16.getReturnType()) { - var2.methods[var3] = var16; - } - } + 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; } - var2.arguments[var3] = var10; - } - } else { - var5 = var0.readStringCp1252NullTerminated(); - var6 = var0.readStringCp1252NullTerminated(); - var7 = 0; - if (var4 == 1) { - var7 = var0.readInt(); - } + if (var12 != var11) { + if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { + var9 = false; + } + break; + } - var2.operations[var3] = var4; - var2.intReplaceValues[var3] = var7; - if (VarcInt.loadClassFromDescriptor(var5).getClassLoader() == null) { - throw new SecurityException(); + if (var10 == 3) { + var9 = false; + } } + } while(var9); - var2.fields[var3] = Reflection.findField(VarcInt.loadClassFromDescriptor(var5), var6); + var9 = true; + + do { + ++var5; + + for (var10 = 0; var10 < 4; ++var10) { + if (var3[var10] == 2) { + var11 = var0[var5].index; + var12 = var8.index; + } else if (var3[var10] == 1) { + var11 = var0[var5].population; + var12 = var8.population; + if (var11 == -1 && var4[var10] == 1) { + var11 = 2001; + } + + if (var12 == -1 && var4[var10] == 1) { + var12 = 2001; + } + } else if (var3[var10] == 3) { + var11 = var0[var5].isMembersOnly() ? 1 : 0; + var12 = var8.isMembersOnly() ? 1 : 0; + } else { + var11 = var0[var5].id; + var12 = var8.id; + } + + if (var12 != var11) { + if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { + var9 = false; + } + break; + } + + if (var10 == 3) { + var9 = false; + } + } + } while(var9); + + if (var5 < var6) { + World var13 = var0[var5]; + var0[var5] = var0[var6]; + var0[var6] = var13; } - } 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; + } + + sortWorlds(var0, var1, var6, var3, var4); + sortWorlds(var0, var6 + 1, var2, var3, var4); + } + + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-2145211344" + ) + public static void method3655() { + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { + if (ArchiveDiskActionHandler.field3120 != 0) { + ArchiveDiskActionHandler.field3120 = 1; + + try { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); + } catch (InterruptedException var3) { + } + } + + } + } + + @ObfuscatedName("gm") + @ObfuscatedSignature( + signature = "(IIIII)V", + garbageValue = "551859372" + ) + @Export("drawEntities") + static final void drawEntities(int var0, int var1, int var2, int var3) { + ++Client.viewportDrawCount; + if (Message.localPlayer.x >> 7 == Client.destinationX && Message.localPlayer.y >> 7 == Client.destinationY) { + Client.destinationX = 0; + } + + WorldMapAreaData.method686(); + if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { + class14.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); + } + + Archive.addNpcsToScene(true); + WorldMapIcon_1.method296(); + Archive.addNpcsToScene(false); + + int var6; + for (Projectile var4 = (Projectile)Client.projectiles.last(); var4 != null; var4 = (Projectile)Client.projectiles.previous()) { + if (var4.plane == UrlRequest.Client_plane && Client.cycle <= var4.cycleEnd) { + if (Client.cycle >= var4.cycleStart) { + if (var4.targetIndex > 0) { + NPC var31 = Client.npcs[var4.targetIndex - 1]; + if (var31 != null && var31.x >= 0 && var31.x < 13312 && var31.y >= 0 && var31.y < 13312) { + var4.setDestination(var31.x, var31.y, ScriptEvent.getTileHeight(var31.x, var31.y, var4.plane) - var4.endHeight, Client.cycle); + } + } + + if (var4.targetIndex < 0) { + var6 = -var4.targetIndex - 1; + Player var35; + if (var6 == Client.localPlayerIndex) { + var35 = Message.localPlayer; + } else { + var35 = Client.players[var6]; + } + + if (var35 != null && var35.x >= 0 && var35.x < 13312 && var35.y >= 0 && var35.y < 13312) { + var4.setDestination(var35.x, var35.y, ScriptEvent.getTileHeight(var35.x, var35.y, var4.plane) - var4.endHeight, Client.cycle); + } + } + + var4.advance(Client.field690); + class14.scene.drawEntity(UrlRequest.Client_plane, (int)var4.x, (int)var4.y, (int)var4.z, 60, var4, var4.yaw, -1L, false); + } + } else { + var4.remove(); } } - class96.reflectionChecks.addFirst(var2); - } + UserComparator10.method3337(); + Frames.setViewportShape(var0, var1, var2, var3, true); + var0 = Client.viewportOffsetX; + var1 = Client.viewportOffsetY; + var2 = Client.viewportWidth; + var3 = Client.viewportHeight; + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); + int var5; + int var7; + int var8; + int var9; + int var10; + int var11; + int var12; + int var13; + int var14; + int var15; + int var16; + int var18; + int var28; + if (!Client.isCameraLocked) { + var28 = Client.camAngleX; + if (Client.field714 / 256 > var28) { + var28 = Client.field714 / 256; + } - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "25" - ) - static final int method3730() { - return ViewportMouse.ViewportMouse_y; - } + if (Client.field779[4] && Client.field876[4] + 128 > var28) { + var28 = Client.field876[4] + 128; + } + + var5 = Client.camAngleY & 2047; + var6 = WorldMapSectionType.oculusOrbFocalPointX; + var7 = WorldMapManager.field314; + var8 = Language.oculusOrbFocalPointY; + var9 = var28 * 3 + 600; + var10 = WorldMapManager.method635(var9, var3); + var11 = 2048 - var28 & 2047; + var12 = 2048 - var5 & 2047; + var13 = 0; + var14 = 0; + var15 = var10; + int var17; + if (var11 != 0) { + var16 = Rasterizer3D.Rasterizer3D_sine[var11]; + var17 = Rasterizer3D.Rasterizer3D_cosine[var11]; + var18 = var17 * var14 - var16 * var10 >> 16; + var15 = var10 * var17 + var16 * var14 >> 16; + var14 = var18; + } + + if (var12 != 0) { + var16 = Rasterizer3D.Rasterizer3D_sine[var12]; + var17 = Rasterizer3D.Rasterizer3D_cosine[var12]; + var18 = var13 * var17 + var15 * var16 >> 16; + var15 = var15 * var17 - var16 * var13 >> 16; + var13 = var18; + } + + MusicPatchNode2.cameraX = var6 - var13; + class60.cameraY = var7 - var14; + UserComparator9.cameraZ = var8 - var15; + ViewportMouse.cameraPitch = var28; + WorldMapLabelSize.cameraYaw = var5; + if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (WorldMapSectionType.oculusOrbFocalPointX >> 7 != Message.localPlayer.x >> 7 || Language.oculusOrbFocalPointY >> 7 != Message.localPlayer.y >> 7)) { + var16 = Message.localPlayer.plane; + var17 = MusicPatchPcmStream.baseX * 64 + (WorldMapSectionType.oculusOrbFocalPointX >> 7); + var18 = ScriptEvent.baseY * 64 + (Language.oculusOrbFocalPointY >> 7); + PacketBufferNode var19 = class2.getPacketBufferNode(ClientPacket.field2251, Client.packetWriter.isaacCipher); + var19.packetBuffer.writeIntME(var17); + var19.packetBuffer.writeShortLE(Client.field710); + var19.packetBuffer.writeIntME(var18); + var19.packetBuffer.method5569(var16); + Client.packetWriter.addNode(var19); + } + } + + if (!Client.isCameraLocked) { + var28 = WorldMapRectangle.method275(); + } else { + var28 = WorldMapIcon_0.method202(); + } + + var5 = MusicPatchNode2.cameraX; + var6 = class60.cameraY; + var7 = UserComparator9.cameraZ; + var8 = ViewportMouse.cameraPitch; + var9 = WorldMapLabelSize.cameraYaw; + + for (var10 = 0; var10 < 5; ++var10) { + if (Client.field779[var10]) { + var11 = (int)(Math.random() * (double)(Client.field875[var10] * 2 + 1) - (double)Client.field875[var10] + Math.sin((double)Client.field877[var10] / 100.0D * (double)Client.field878[var10]) * (double)Client.field876[var10]); + if (var10 == 0) { + MusicPatchNode2.cameraX += var11; + } + + if (var10 == 1) { + class60.cameraY += var11; + } + + if (var10 == 2) { + UserComparator9.cameraZ += var11; + } + + if (var10 == 3) { + WorldMapLabelSize.cameraYaw = var11 + WorldMapLabelSize.cameraYaw & 2047; + } + + if (var10 == 4) { + ViewportMouse.cameraPitch += var11; + if (ViewportMouse.cameraPitch < 128) { + ViewportMouse.cameraPitch = 128; + } + + if (ViewportMouse.cameraPitch > 383) { + ViewportMouse.cameraPitch = 383; + } + } + } + } + + var10 = MouseHandler.MouseHandler_x; + var11 = MouseHandler.MouseHandler_y; + if (MouseHandler.MouseHandler_lastButton != 0) { + var10 = MouseHandler.MouseHandler_lastPressedX; + var11 = MouseHandler.MouseHandler_lastPressedY; + } + + if (var10 >= var0 && var10 < var0 + var2 && var11 >= var1 && var11 < var3 + var1) { + var12 = var10 - var0; + var13 = var11 - var1; + ViewportMouse.ViewportMouse_x = var12; + ViewportMouse.ViewportMouse_y = var13; + ViewportMouse.ViewportMouse_isInViewport = true; + ViewportMouse.ViewportMouse_entityCount = 0; + ViewportMouse.ViewportMouse_false0 = false; + } else { + class226.method4099(); + } + + WorldMapLabel.playPcmPlayers(); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); + WorldMapLabel.playPcmPlayers(); + var12 = Rasterizer3D.Rasterizer3D_zoom; + Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; + class14.scene.draw(MusicPatchNode2.cameraX, class60.cameraY, UserComparator9.cameraZ, ViewportMouse.cameraPitch, WorldMapLabelSize.cameraYaw, var28); + Rasterizer3D.Rasterizer3D_zoom = var12; + WorldMapLabel.playPcmPlayers(); + class14.scene.clearTempGameObjects(); + Client.overheadTextCount = 0; + boolean var33 = false; + var14 = -1; + var15 = -1; + var16 = Players.Players_count; + int[] var29 = Players.Players_indices; + + for (var18 = 0; var18 < var16 + Client.npcCount; ++var18) { + Object var34; + if (var18 < var16) { + var34 = Client.players[var29[var18]]; + if (var29[var18] == Client.combatTargetPlayerIndex) { + var33 = true; + var14 = var18; + continue; + } + + if (var34 == Message.localPlayer) { + var15 = var18; + continue; + } + } else { + var34 = Client.npcs[Client.npcIndices[var18 - var16]]; + } + + UserComparator5.drawActor2d((Actor)var34, var18, var0, var1, var2, var3); + } + + if (Client.renderSelf && var15 != -1) { + UserComparator5.drawActor2d(Message.localPlayer, var15, var0, var1, var2, var3); + } + + if (var33) { + UserComparator5.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var14, var0, var1, var2, var3); + } + + for (var18 = 0; var18 < Client.overheadTextCount; ++var18) { + int var30 = Client.overheadTextXs[var18]; + int var20 = Client.overheadTextYs[var18]; + int var21 = Client.overheadTextXOffsets[var18]; + int var22 = Client.overheadTextAscents[var18]; + boolean var23 = true; + + while (var23) { + var23 = false; + + for (int var24 = 0; var24 < var18; ++var24) { + if (var20 + 2 > Client.overheadTextYs[var24] - Client.overheadTextAscents[var24] && var20 - var22 < Client.overheadTextYs[var24] + 2 && var30 - var21 < Client.overheadTextXOffsets[var24] + Client.overheadTextXs[var24] && var30 + var21 > Client.overheadTextXs[var24] - Client.overheadTextXOffsets[var24] && Client.overheadTextYs[var24] - Client.overheadTextAscents[var24] < var20) { + var20 = Client.overheadTextYs[var24] - Client.overheadTextAscents[var24]; + var23 = true; + } + } + } + + Client.viewportTempX = Client.overheadTextXs[var18]; + Client.viewportTempY = Client.overheadTextYs[var18] = var20; + String var32 = Client.overheadText[var18]; + if (Client.chatEffects == 0) { + int var25 = 16776960; + if (Client.overheadTextColors[var18] < 6) { + var25 = Client.field864[Client.overheadTextColors[var18]]; + } + + if (Client.overheadTextColors[var18] == 6) { + var25 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; + } + + if (Client.overheadTextColors[var18] == 7) { + var25 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; + } + + if (Client.overheadTextColors[var18] == 8) { + var25 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016; + } + + int var26; + if (Client.overheadTextColors[var18] == 9) { + var26 = 150 - Client.overheadTextCyclesRemaining[var18]; + if (var26 < 50) { + var25 = var26 * 1280 + 16711680; + } else if (var26 < 100) { + var25 = 16776960 - (var26 - 50) * 327680; + } else if (var26 < 150) { + var25 = (var26 - 100) * 5 + 65280; + } + } + + if (Client.overheadTextColors[var18] == 10) { + var26 = 150 - Client.overheadTextCyclesRemaining[var18]; + if (var26 < 50) { + var25 = var26 * 5 + 16711680; + } else if (var26 < 100) { + var25 = 16711935 - (var26 - 50) * 327680; + } else if (var26 < 150) { + var25 = (var26 - 100) * 327680 + 255 - (var26 - 100) * 5; + } + } + + if (Client.overheadTextColors[var18] == 11) { + var26 = 150 - Client.overheadTextCyclesRemaining[var18]; + if (var26 < 50) { + var25 = 16777215 - var26 * 327685; + } else if (var26 < 100) { + var25 = (var26 - 50) * 327685 + 65280; + } else if (var26 < 150) { + var25 = 16777215 - (var26 - 100) * 327680; + } + } + + if (Client.overheadTextEffects[var18] == 0) { + GrandExchangeOffer.fontBold12.drawCentered(var32, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0); + } + + if (Client.overheadTextEffects[var18] == 1) { + GrandExchangeOffer.fontBold12.drawCenteredWave(var32, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount); + } + + if (Client.overheadTextEffects[var18] == 2) { + GrandExchangeOffer.fontBold12.drawCenteredWave2(var32, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount); + } + + if (Client.overheadTextEffects[var18] == 3) { + GrandExchangeOffer.fontBold12.drawCenteredShake(var32, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var18]); + } + + if (Client.overheadTextEffects[var18] == 4) { + var26 = (150 - Client.overheadTextCyclesRemaining[var18]) * (GrandExchangeOffer.fontBold12.stringWidth(var32) + 100) / 150; + Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); + GrandExchangeOffer.fontBold12.draw(var32, var0 + Client.viewportTempX + 50 - var26, Client.viewportTempY + var1, var25, 0); + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); + } + + if (Client.overheadTextEffects[var18] == 5) { + var26 = 150 - Client.overheadTextCyclesRemaining[var18]; + int var27 = 0; + if (var26 < 25) { + var27 = var26 - 25; + } else if (var26 > 125) { + var27 = var26 - 125; + } + + Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - GrandExchangeOffer.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); + GrandExchangeOffer.fontBold12.drawCentered(var32, var0 + Client.viewportTempX, var27 + Client.viewportTempY + var1, var25, 0); + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); + } + } else { + GrandExchangeOffer.fontBold12.drawCentered(var32, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); + } + } + + WorldMapSprite.method408(var0, var1); + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field690); + LoginPacket.method3574(); + MusicPatchNode2.cameraX = var5; + class60.cameraY = var6; + UserComparator9.cameraZ = var7; + ViewportMouse.cameraPitch = var8; + WorldMapLabelSize.cameraYaw = var9; + if (Client.isLoading && class188.method3601(true, false) == 0) { + Client.isLoading = false; + } + + if (Client.isLoading) { + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); + class1.drawLoadingMessage("Loading - please wait.", false); + } - @ObfuscatedName("ku") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-1031778889" - ) - static void method3732(int var0) { - Client.oculusOrbState = var0; } } diff --git a/runescape-client/src/main/java/class195.java b/runescape-client/src/main/java/class195.java index f87174a235..159998e2f6 100644 --- a/runescape-client/src/main/java/class195.java +++ b/runescape-client/src/main/java/class195.java @@ -3,7 +3,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gk") +@ObfuscatedName("ge") public class class195 { static { new HashMap(); @@ -11,90 +11,228 @@ public class class195 { @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "338644626" + signature = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lgs;I)I", + garbageValue = "265459979" ) - public static boolean method3743(int var0) { - return var0 == WorldMapDecorationType.field2749.id; - } + @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; - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(IIII)Lci;", - garbageValue = "-990900321" - ) - @Export("getWorldMapScript") - static Script getWorldMapScript(int var0, int var1, int var2) { - int var3 = (var1 << 8) + var0; - Script var5 = class49.method880(var3, var0); - if (var5 != null) { - return var5; - } else { - int var6 = var0 + (var2 + 40000 << 8); - var5 = class49.method880(var6, var0); - return var5 != null ? var5 : null; - } - } + while (var5 - var7 < var3 || var6 - var8 < var4) { + if (var5 - var7 >= var3) { + return -1; + } - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "([BIIB)Ljava/lang/String;", - garbageValue = "9" - ) - static String method3739(byte[] var0, int var1, int var2) { - StringBuilder var3 = new StringBuilder(); + if (var6 - var8 >= var4) { + return 1; + } - for (int var4 = var1; var4 < var2 + var1; var4 += 3) { - int var5 = var0[var4] & 255; - var3.append(class289.field3653[var5 >>> 2]); - if (var4 < var2 - 1) { - int var6 = var0[var4 + 1] & 255; - var3.append(class289.field3653[(var5 & 3) << 4 | var6 >>> 4]); - if (var4 < var2 - 2) { - int var7 = var0[var4 + 2] & 255; - var3.append(class289.field3653[(var6 & 15) << 2 | var7 >>> 6]).append(class289.field3653[var7 & 63]); - } else { - var3.append(class289.field3653[(var6 & 15) << 2]).append("="); - } + char var9; + if (var7 != 0) { + var9 = (char)var7; + boolean var14 = false; } else { - var3.append(class289.field3653[(var5 & 3) << 4]).append("=="); + var9 = var0.charAt(var5++); + } + + char var10; + if (var8 != 0) { + var10 = (char)var8; + boolean var15 = false; + } else { + var10 = var1.charAt(var6++); + } + + byte var11; + if (var9 == 198) { + var11 = 69; + } else if (var9 == 230) { + var11 = 101; + } else if (var9 == 223) { + var11 = 115; + } else if (var9 == 338) { + var11 = 69; + } else if (var9 == 339) { + var11 = 101; + } else { + var11 = 0; + } + + var7 = var11; + byte var12; + if (var10 == 198) { + var12 = 69; + } else if (var10 == 230) { + var12 = 101; + } else if (var10 == 223) { + var12 = 115; + } else if (var10 == 338) { + var12 = 69; + } else if (var10 == 339) { + var12 = 101; + } else { + var12 = 0; + } + + var8 = var12; + var9 = Interpreter.standardizeChar(var9, var2); + var10 = Interpreter.standardizeChar(var10, var2); + if (var9 != var10 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { + var9 = Character.toLowerCase(var9); + var10 = Character.toLowerCase(var10); + if (var10 != var9) { + return FloorOverlayDefinition.lowercaseChar(var9, var2) - FloorOverlayDefinition.lowercaseChar(var10, var2); + } } } - return var3.toString(); - } + int var16 = Math.min(var3, var4); - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1518312277" - ) - public static void method3746() { - VarpDefinition.VarpDefinition_cached.clear(); - } - - @ObfuscatedName("gf") - @ObfuscatedSignature( - signature = "(IIII)I", - garbageValue = "-1206093044" - ) - @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 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; } - 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) + var6 * Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] >> 7; - return var7 * var9 + var8 * (128 - var7) >> 7; + char var18 = var0.charAt(var5); + var20 = var1.charAt(var6); + if (var20 != var18 && Character.toUpperCase(var18) != Character.toUpperCase(var20)) { + var18 = Character.toLowerCase(var18); + var20 = Character.toLowerCase(var20); + if (var20 != var18) { + return FloorOverlayDefinition.lowercaseChar(var18, var2) - FloorOverlayDefinition.lowercaseChar(var20, var2); + } + } + } + + var17 = var3 - var4; + if (var17 != 0) { + return var17; } else { + for (int var19 = 0; var19 < var16; ++var19) { + var20 = var0.charAt(var19); + char var13 = var1.charAt(var19); + if (var13 != var20) { + return FloorOverlayDefinition.lowercaseChar(var20, var2) - FloorOverlayDefinition.lowercaseChar(var13, var2); + } + } + return 0; } } + + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "(Lhz;Ljava/lang/String;Ljava/lang/String;I)[Lli;", + garbageValue = "900834692" + ) + public static IndexedSprite[] method3667(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); + int var4 = var0.getFileId(var3, var2); + IndexedSprite[] var5; + if (!HitSplatDefinition.method4586(var0, var3, var4)) { + var5 = null; + } else { + IndexedSprite[] var7 = new IndexedSprite[class325.SpriteBuffer_spriteCount]; + + for (int var8 = 0; var8 < class325.SpriteBuffer_spriteCount; ++var8) { + IndexedSprite var9 = var7[var8] = new IndexedSprite(); + var9.width = class325.SpriteBuffer_spriteWidth; + var9.height = class325.SpriteBuffer_spriteHeight; + var9.xOffset = class325.SpriteBuffer_xOffsets[var8]; + var9.yOffset = class325.SpriteBuffer_yOffsets[var8]; + var9.subWidth = UserComparator1.SpriteBuffer_spriteWidths[var8]; + var9.subHeight = class325.SpriteBuffer_spriteHeights[var8]; + var9.palette = class268.SpriteBuffer_spritePalette; + var9.pixels = class290.SpriteBuffer_pixels[var8]; + } + + Message.method1223(); + var5 = var7; + } + + return var5; + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "(Lkq;IB)Ljava/lang/String;", + garbageValue = "125" + ) + static String method3664(Buffer var0, int var1) { + try { + int var2 = var0.readUShortSmart(); + if (var2 > var1) { + var2 = var1; + } + + byte[] var3 = new byte[var2]; + var0.offset += class206.huffman.decompress(var0.array, var0.offset, var3, 0, var2); + String var4 = class225.decodeStringCp1252(var3, 0, var2); + return var4; + } catch (Exception var6) { + return "Cabbage"; + } + } + + @ObfuscatedName("fd") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "1463713032" + ) + @Export("updateGameState") + static void updateGameState(int var0) { + if (var0 != Client.gameState) { + if (Client.gameState == 0) { + class206.client.method947(); + } + + if (var0 == 20 || var0 == 40 || var0 == 45) { + Client.loginState = 0; + Client.field663 = 0; + Client.field740 = 0; + Client.timer.method5017(var0); + if (var0 != 20) { + AbstractWorldMapIcon.method612(false); + } + } + + if (var0 != 20 && var0 != 40 && VertexNormal.field1730 != null) { + VertexNormal.field1730.close(); + VertexNormal.field1730 = null; + } + + if (Client.gameState == 25) { + Client.field734 = 0; + Client.field824 = 0; + Client.field859 = 1; + Client.field683 = 0; + Client.field684 = 1; + } + + if (var0 != 5 && var0 != 10) { + if (var0 == 20) { + DevicePcmPlayerProvider.method841(ServerBuild.archive10, class3.archive8, true, Client.gameState == 11 ? 4 : 0); + } else if (var0 == 11) { + DevicePcmPlayerProvider.method841(ServerBuild.archive10, class3.archive8, false, 4); + } else { + Frames.method3280(); + } + } else { + DevicePcmPlayerProvider.method841(ServerBuild.archive10, class3.archive8, true, 0); + } + + Client.gameState = var0; + } + } } diff --git a/runescape-client/src/main/java/class197.java b/runescape-client/src/main/java/class197.java index 14327c302d..8eb8a58b18 100644 --- a/runescape-client/src/main/java/class197.java +++ b/runescape-client/src/main/java/class197.java @@ -3,56 +3,83 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gq") +@ObfuscatedName("gv") public class class197 { - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lhf;" + signature = "Lhz;" ) @Export("musicPatchesArchive") public static AbstractArchive musicPatchesArchive; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lhf;" + signature = "Lhz;" ) @Export("musicSamplesArchive") public static AbstractArchive musicSamplesArchive; - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lhf;" + signature = "Lhz;" ) @Export("soundEffectsArchive") public static AbstractArchive soundEffectsArchive; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = 569775055 - ) - public static int field2411; @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lhf;" - ) - @Export("musicTrackArchive") - public static AbstractArchive musicTrackArchive; - @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 2134983541 + intValue = -680038187 + ) + public static int field2392; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 1263500685 ) @Export("musicTrackVolume") - public static int musicTrackVolume; + static int musicTrackVolume; + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "Lgh;" + ) + @Export("musicTrack") + public static MusicTrack musicTrack; + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "Lha;" + ) + static Widget field2398; + @ObfuscatedName("an") + @ObfuscatedSignature( + signature = "Llh;" + ) + static Bounds field2397; + @ObfuscatedName("en") + @ObfuscatedGetter( + intValue = -54870407 + ) + @Export("port1") + static int port1; static { - field2411 = 0; + field2392 = 0; } - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(III)Lba;", - garbageValue = "1833957440" + signature = "(II)Lip;", + garbageValue = "760670759" ) - @Export("Messages_getByChannelAndID") - static Message Messages_getByChannelAndID(int var0, int var1) { - ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); - return var2.getMessage(var1); + @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/class2.java b/runescape-client/src/main/java/class2.java index 876f757d5d..657a165fc1 100644 --- a/runescape-client/src/main/java/class2.java +++ b/runescape-client/src/main/java/class2.java @@ -2,105 +2,162 @@ 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("b") +@ObfuscatedName("y") final class class2 implements class0 { - @ObfuscatedName("p") + @ObfuscatedName("da") + @ObfuscatedSignature( + signature = "Lif;" + ) + @Export("archive2") + static Archive archive2; + @ObfuscatedName("fk") @ObfuscatedGetter( - intValue = -722721087 + longValue = -4799784442313615623L ) - static int field5; - @ObfuscatedName("cb") - @ObfuscatedSignature( - signature = "Lbr;" - ) - @Export("mouseRecorder") - static MouseRecorder mouseRecorder; - @ObfuscatedName("dq") - @ObfuscatedSignature( - signature = "Lij;" - ) - @Export("archive9") - static Archive archive9; - @ObfuscatedName("gc") - @ObfuscatedSignature( - signature = "Lel;" - ) - @Export("scene") - static Scene scene; + static long field4; - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Ljava/lang/Object;Lkg;I)V", - garbageValue = "-1331780546" + signature = "(Ljava/lang/Object;Lkq;I)V", + garbageValue = "-685052934" ) - public void vmethod57(Object var1, Buffer var2) { - this.method26((Long)var1, var2); + public void vmethod53(Object var1, Buffer var2) { + this.method22((Long)var1, var2); + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(Lkq;I)Ljava/lang/Object;", + garbageValue = "390816352" + ) + public Object vmethod60(Buffer var1) { + return var1.readLong(); + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(Ljava/lang/Long;Lkq;I)V", + garbageValue = "-1352577432" + ) + void method22(Long var1, Buffer var2) { + var2.writeLong(var1); } @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Lkg;I)Ljava/lang/Object;", - garbageValue = "1713449680" + signature = "(Lfh;Llr;I)Lfz;", + garbageValue = "890540527" ) - public Object vmethod65(Buffer var1) { - return var1.readLong(); - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "(Ljava/lang/Long;Lkg;I)V", - garbageValue = "-1453735507" - ) - void method26(Long var1, Buffer var2) { - var2.writeLong(var1); - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(I)[Lhb;", - garbageValue = "277199676" - ) - @Export("PlayerType_values") - public static PlayerType[] PlayerType_values() { - return new PlayerType[]{PlayerType.PlayerType_playerModerator, PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_ultimateIronman, PlayerType.PlayerType_ironman, PlayerType.PlayerType_normal}; - } - - @ObfuscatedName("gt") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-5" - ) - static final void method31() { - Client.field756 = 0; - int var0 = class51.baseX * 64 + (class215.localPlayer.x >> 7); - int var1 = VarcInt.baseY * 64 + (class215.localPlayer.y >> 7); - if (var0 >= 3053 && var0 <= 3156 && var1 >= 3056 && var1 <= 3136) { - Client.field756 = 1; + @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]; } - if (var0 >= 3072 && var0 <= 3118 && var1 >= 9492 && var1 <= 9535) { - Client.field756 = 1; - } - - if (Client.field756 == 1 && var0 >= 3139 && var0 <= 3199 && var1 >= 3008 && var1 <= 3062) { - Client.field756 = 0; + 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("hq") + @ObfuscatedName("a") + @Export("Entity_unpackID") + public static int Entity_unpackID(long var0) { + return (int)(var0 >>> 17 & 4294967295L); + } + + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-487610810" + signature = "(ILcu;ZB)I", + garbageValue = "43" ) - @Export("addCancelMenuEntry") - static void addCancelMenuEntry() { - RouteStrategy.method3641(); - Client.menuActions[0] = "Cancel"; - Client.menuTargets[0] = ""; - Client.menuOpcodes[0] = 1006; - Client.menuShiftClick[0] = false; - Client.menuOptionsCount = 1; + static int method34(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? UserComparator7.field1946 : class197.field2398; + if (var0 == ScriptOpcodes.CC_GETX) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.x; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETY) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.y; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.width; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.height; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETHIDE) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETLAYER) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.parentId; + return 1; + } else { + return 2; + } + } + + @ObfuscatedName("hj") + @ObfuscatedSignature( + signature = "(I)Z", + garbageValue = "32937024" + ) + static boolean method27() { + return (Client.drawPlayerNames & 2) != 0; + } + + @ObfuscatedName("jh") + @ObfuscatedSignature( + signature = "(Lha;III)V", + garbageValue = "65280" + ) + @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.height) / 2 + (var2 * var0.rawY >> 14); + } else { + var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); + } + } } diff --git a/runescape-client/src/main/java/class208.java b/runescape-client/src/main/java/class208.java deleted file mode 100644 index d891b9cc28..0000000000 --- a/runescape-client/src/main/java/class208.java +++ /dev/null @@ -1,19 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("hr") -public class class208 { - @ObfuscatedName("je") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "682234129" - ) - static void method4017(int var0) { - Tiles.tempMenuAction = new MenuAction(); - Tiles.tempMenuAction.param0 = Client.menuArguments1[var0]; - Tiles.tempMenuAction.param1 = Client.menuArguments2[var0]; - Tiles.tempMenuAction.opcode = Client.menuOpcodes[var0]; - Tiles.tempMenuAction.identifier = Client.menuIdentifiers[var0]; - Tiles.tempMenuAction.action = Client.menuActions[var0]; - } -} diff --git a/runescape-client/src/main/java/class210.java b/runescape-client/src/main/java/class210.java index b467d5ac0a..004c05d8a0 100644 --- a/runescape-client/src/main/java/class210.java +++ b/runescape-client/src/main/java/class210.java @@ -2,28 +2,26 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ha") +@ObfuscatedName("hj") public class class210 { - @ObfuscatedName("u") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lhg;" + signature = "(I)Z", + garbageValue = "-1841265610" ) - @Export("huffman") - static Huffman huffman; - @ObfuscatedName("df") - @ObfuscatedSignature( - signature = "Lij;" - ) - @Export("archive15") - static Archive archive15; + public static boolean method3947() { + ReflectionCheck var0 = (ReflectionCheck)class117.reflectionChecks.last(); + return var0 != null; + } - @ObfuscatedName("u") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(IB)Z", - garbageValue = "1" + signature = "(III)Lbs;", + garbageValue = "-453941581" ) - @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; + @Export("Messages_getByChannelAndID") + static Message Messages_getByChannelAndID(int var0, int var1) { + ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); + return var2.getMessage(var1); } } diff --git a/runescape-client/src/main/java/class215.java b/runescape-client/src/main/java/class215.java index 9269bf6d3d..131415344e 100644 --- a/runescape-client/src/main/java/class215.java +++ b/runescape-client/src/main/java/class215.java @@ -1,118 +1,47 @@ -import java.util.Date; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hc") +@ObfuscatedName("hn") public class class215 { - @ObfuscatedName("u") - public static final short[] field2553; - @ObfuscatedName("f") - public static final short[][] field2554; - @ObfuscatedName("b") - public static final short[] field2555; - @ObfuscatedName("g") - public static final short[][] field2556; - @ObfuscatedName("jg") + @ObfuscatedName("sg") @ObfuscatedSignature( - signature = "Lbg;" + signature = "Lic;" ) - @Export("localPlayer") - static Player localPlayer; + public static class237 field2534; + @ObfuscatedName("f") + public static final short[] field2529; + @ObfuscatedName("i") + public static final short[][] field2533; + @ObfuscatedName("y") + public static final short[] field2531; + @ObfuscatedName("w") + public static final short[][] field2532; static { - field2553 = new short[]{6798, 8741, 25238, 4626, 4550}; - field2554 = 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}}; - field2555 = new short[]{-10304, 9104, -1, -1, -1}; - field2556 = 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}; + field2533 = new short[][]{{6798, 107, 10283, 16, 4797, 7744, 5799, 4634, -31839, 22433, 2983, -11343, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {8741, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 25239, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {25238, 8742, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {4626, 11146, 6439, 12, 4758, 10270}, {4550, 4537, 5681, 5673, 5790, 6806, 8076, 4574, 17050, 0, 127, -31821, -17991}}; + field2531 = new short[]{-10304, 9104, -1, -1, -1}; + field2532 = new short[][]{{6554, 115, 10304, 28, 5702, 7756, 5681, 4510, -31835, 22437, 2859, -11339, 16, 5157, 10446, 3658, -27314, -21965, 472, 580, 784, 21966, 28950, -15697, -14002}, {9104, 10275, 7595, 3610, 7975, 8526, 918, -26734, 24466, 10145, -6882, 5027, 1457, 16565, -30545, 25486, 24, 5392, 10429, 3673, -27335, -21957, 192, 687, 412, 21821, 28835, -15460, -14019}, new short[0], new short[0], new short[0]}; } - @ObfuscatedName("u") - public static String method4107(long var0) { - Calendar.Calendar_calendar.setTime(new Date(var0)); - int var2 = Calendar.Calendar_calendar.get(7); - int var3 = Calendar.Calendar_calendar.get(5); - int var4 = Calendar.Calendar_calendar.get(2); - int var5 = Calendar.Calendar_calendar.get(1); - int var6 = Calendar.Calendar_calendar.get(11); - int var7 = Calendar.Calendar_calendar.get(12); - int var8 = Calendar.Calendar_calendar.get(13); - return Calendar.DAYS_OF_THE_WEEK[var2 - 1] + ", " + var3 / 10 + var3 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var4] + "-" + var5 + " " + var6 / 10 + var6 % 10 + ":" + var7 / 10 + var7 % 10 + ":" + var8 / 10 + var8 % 10 + " GMT"; - } - - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "-266411833" + signature = "(IB)Lir;", + garbageValue = "41" ) - public static boolean method4109(int var0) { - return (var0 >> 28 & 1) != 0; - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "(B)Lbp;", - garbageValue = "11" - ) - @Export("worldListStart") - static World worldListStart() { - World.World_listCount = 0; - return class1.getNextWorldListWorld(); - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "(Lhl;II)V", - garbageValue = "-533356925" - ) - @Export("Widget_setKeyIgnoreHeld") - static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { - if (var0.field2592 == null) { - throw new RuntimeException(); + public static VarcInt method4012(int var0) { + VarcInt var1 = (VarcInt)VarcInt.VarcInt_cached.get((long)var0); + if (var1 != null) { + return var1; } else { - if (var0.field2695 == null) { - var0.field2695 = new int[var0.field2592.length]; + byte[] var2 = VarcInt.VarcInt_archive.takeFile(19, var0); + var1 = new VarcInt(); + if (var2 != null) { + var1.method4388(new Buffer(var2)); } - var0.field2695[var1] = Integer.MAX_VALUE; + VarcInt.VarcInt_cached.put(var1, (long)var0); + return var1; } } - - @ObfuscatedName("hj") - @ObfuscatedSignature( - signature = "(Lbe;I)V", - garbageValue = "2102952401" - ) - static final void method4108(PendingSpawn var0) { - long var1 = 0L; - int var3 = -1; - int var4 = 0; - int var5 = 0; - if (var0.type == 0) { - var1 = class2.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 1) { - var1 = class2.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 2) { - var1 = class2.scene.getGameObjectTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 3) { - var1 = class2.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); - } - - if (var1 != 0L) { - int var6 = class2.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); - var3 = ItemContainer.Entity_unpackID(var1); - var4 = var6 & 31; - var5 = var6 >> 6 & 3; - } - - var0.objectId = var3; - var0.field924 = var4; - var0.field929 = var5; - } } diff --git a/runescape-client/src/main/java/class216.java b/runescape-client/src/main/java/class216.java index 8702578863..f018c8de5c 100644 --- a/runescape-client/src/main/java/class216.java +++ b/runescape-client/src/main/java/class216.java @@ -1,26 +1,30 @@ -import net.runelite.mapping.Export; +import java.util.Iterator; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hv") +@ObfuscatedName("hx") public class class216 { - @ObfuscatedName("z") - @Export("SpriteBuffer_yOffsets") - static int[] SpriteBuffer_yOffsets; @ObfuscatedName("y") - @Export("ByteArrayPool_altSizeArrayCounts") - static int[] ByteArrayPool_altSizeArrayCounts; - - @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(Ljava/lang/String;II)V", - garbageValue = "-126430026" + signature = "(Ljava/lang/String;II)Z", + garbageValue = "-1882269787" ) - static final void method4118(String var0, int var1) { - PacketBufferNode var2 = ModelData0.getPacketBufferNode(ClientPacket.field2319, Client.packetWriter.isaacCipher); - var2.packetBuffer.writeByte(class173.stringCp1252NullTerminatedByteSize(var0) + 1); - var2.packetBuffer.writeStringCp1252NullTerminated(var0); - var2.packetBuffer.writeByte(var1); - Client.packetWriter.addNode(var2); + static boolean method4017(String var0, int var1) { + return GrandExchangeEvent.method79(var0, var1, "openjs"); + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "178095242" + ) + static void method4013() { + Iterator var0 = Messages.Messages_hashTable.iterator(); + + while (var0.hasNext()) { + Message var1 = (Message)var0.next(); + var1.clearIsFromFriend(); + } + } } diff --git a/runescape-client/src/main/java/class218.java b/runescape-client/src/main/java/class218.java index b9df7c6c5a..5dabbb3a7d 100644 --- a/runescape-client/src/main/java/class218.java +++ b/runescape-client/src/main/java/class218.java @@ -1,17 +1,32 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hj") +@ObfuscatedName("hg") public class class218 { @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "1649772022" + signature = "Lli;" ) - static final void method4179(String var0) { - PacketBufferNode var1 = ModelData0.getPacketBufferNode(ClientPacket.field2219, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(class173.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); + @Export("options_buttons_0Sprite") + static IndexedSprite options_buttons_0Sprite; + + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "(IB)[B", + garbageValue = "1" + ) + @Export("ByteArrayPool_getArray") + public static synchronized byte[] ByteArrayPool_getArray(int var0) { + return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "450645435" + ) + static final int method4074() { + return ViewportMouse.ViewportMouse_x; } } diff --git a/runescape-client/src/main/java/class219.java b/runescape-client/src/main/java/class219.java index 45b506ce18..d4d8e0092c 100644 --- a/runescape-client/src/main/java/class219.java +++ b/runescape-client/src/main/java/class219.java @@ -1,23 +1,49 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("hs") +@ObfuscatedName("hb") public class class219 { - @ObfuscatedName("f") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(Ljava/lang/Throwable;Ljava/lang/String;)Lmr;" + signature = "(ILcu;ZS)I", + garbageValue = "6812" ) - @Export("newRunException") - public static RunException newRunException(Throwable var0, String var1) { - RunException var2; - if (var0 instanceof RunException) { - var2 = (RunException)var0; - var2.message = var2.message + ' ' + var1; + static int method4077(int var0, Script var1, boolean var2) { + Widget var3 = Tile.getWidget(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); + if (var0 == ScriptOpcodes.IF_GETX) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.x; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETY) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.y; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.width; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.height; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETHIDE) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETLAYER) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.parentId; + return 1; } else { - var2 = new RunException(var0, var1); + return 2; } + } - return var2; + @ObfuscatedName("gz") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-857951152" + ) + static void method4076() { + PacketBufferNode var0 = class2.getPacketBufferNode(ClientPacket.field2179, Client.packetWriter.isaacCipher); + var0.packetBuffer.writeByte(ItemDefinition.getWindowedMode()); + var0.packetBuffer.writeShort(GrandExchangeOfferTotalQuantityComparator.canvasWidth); + var0.packetBuffer.writeShort(AttackOption.canvasHeight); + Client.packetWriter.addNode(var0); } } diff --git a/runescape-client/src/main/java/class222.java b/runescape-client/src/main/java/class222.java index 2c556af19e..ca77c82acf 100644 --- a/runescape-client/src/main/java/class222.java +++ b/runescape-client/src/main/java/class222.java @@ -2,81 +2,28 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ht") +@ObfuscatedName("hc") public class class222 { - @ObfuscatedName("f") + @ObfuscatedName("gx") + @Export("regionLandArchiveIds") + static int[] regionLandArchiveIds; + @ObfuscatedName("gr") @ObfuscatedSignature( - signature = "(IB)Ljava/lang/String;", - garbageValue = "0" + signature = "[Lls;" ) - @Export("colorStartTag") - static String colorStartTag(int var0) { - return ""; - } + @Export("headIconPkSprites") + static Sprite[] headIconPkSprites; - @ObfuscatedName("h") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "-649981056" + signature = "(I)V", + garbageValue = "-785436226" ) - @Export("Login_promptCredentials") - static void Login_promptCredentials(boolean var0) { - Login.Login_response1 = ""; - Login.Login_response2 = "Enter your username/email & password."; - Login.Login_response3 = ""; - Login.loginIndex = 2; - if (var0) { - Login.Login_password = ""; - } - - if (Login.Login_username == null || Login.Login_username.length() <= 0) { - if (UserComparator10.clientPreferences.rememberedUsername != null) { - Login.Login_username = UserComparator10.clientPreferences.rememberedUsername; - Client.Login_isUsernameRemembered = true; - } else { - Client.Login_isUsernameRemembered = false; - } - } - - Buddy.method5251(); - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-23" - ) - public static void method4195() { - NPCDefinition.NpcDefinition_cached.clear(); - NPCDefinition.NpcDefinition_cachedModels.clear(); - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - signature = "([BII)I", - garbageValue = "-2031476219" - ) - public static int method4196(byte[] var0, int var1) { - return UserComparator5.method3467(var0, 0, var1); - } - - @ObfuscatedName("fy") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "11" - ) - static final void method4198() { - if (WorldMapID.ClanChat_inClanChat) { - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.sort(); - } - - for (int var0 = 0; var0 < Players.Players_count; ++var0) { - Player var1 = Client.players[Players.Players_indices[var0]]; - var1.clearIsInClanChat(); - } - - WorldMapID.ClanChat_inClanChat = false; + static void method4090() { + if (MouseRecorder.loadWorlds()) { + Login.worldSelectOpen = true; + Login.worldSelectPage = 0; + Login.worldSelectPagesCount = 0; } } diff --git a/runescape-client/src/main/java/class223.java b/runescape-client/src/main/java/class223.java deleted file mode 100644 index b446913d21..0000000000 --- a/runescape-client/src/main/java/class223.java +++ /dev/null @@ -1,13 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("hw") -public class class223 { - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lhf;" - ) - @Export("WorldMapElement_archive") - public static AbstractArchive WorldMapElement_archive; -} diff --git a/runescape-client/src/main/java/class225.java b/runescape-client/src/main/java/class225.java index fa701eea6d..a8ed76c713 100644 --- a/runescape-client/src/main/java/class225.java +++ b/runescape-client/src/main/java/class225.java @@ -2,48 +2,34 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hu") +@ObfuscatedName("hf") public class class225 { - @ObfuscatedName("gz") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lln;" + signature = "([BIII)Ljava/lang/String;", + garbageValue = "1102427544" ) - @Export("redHintArrowSprite") - static Sprite redHintArrowSprite; + @Export("decodeStringCp1252") + public static String decodeStringCp1252(byte[] var0, int var1, int var2) { + char[] var3 = new char[var2]; + int var4 = 0; - @ObfuscatedName("ii") - @ObfuscatedSignature( - signature = "([Lhl;IIIZI)V", - garbageValue = "-1828804382" - ) - @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) { - WorldMapSection1.alignWidgetSize(var6, var2, var3, var4); - PendingSpawn.alignWidgetPosition(var6, var2, var3); - if (var6.scrollX > var6.scrollWidth - var6.width) { - var6.scrollX = var6.scrollWidth - var6.width; + 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; } - 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) { - MilliClock.revalidateWidgetScroll(var0, var6, var4); - } + var3[var4++] = (char)var6; } } + return new String(var3, 0, var4); } } diff --git a/runescape-client/src/main/java/class226.java b/runescape-client/src/main/java/class226.java index 11a2b97931..854fb85cf8 100644 --- a/runescape-client/src/main/java/class226.java +++ b/runescape-client/src/main/java/class226.java @@ -2,55 +2,104 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hq") +@ObfuscatedName("hl") public class class226 { - @ObfuscatedName("gn") - @Export("regions") - static int[] regions; - - @ObfuscatedName("aw") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "([BI)[B", - garbageValue = "-424113908" + signature = "(Ljava/lang/CharSequence;I)J", + garbageValue = "-1275125975" ) - @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.field3152 != 0 && var3 > AbstractArchive.field3152) { - 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.field3152 == 0 || var6 <= AbstractArchive.field3152)) { - byte[] var5 = new byte[var6]; - if (var2 == 1) { - BZip2Decompressor.BZip2Decompressor_decompress(var5, var6, var0, var3, 9); - } else { - AbstractArchive.gzipDecompressor.decompress(var1, var5); - } + public static long method4101(CharSequence var0) { + long var1 = 0L; + int var3 = var0.length(); - return var5; - } else { - throw new RuntimeException(); + for (int var4 = 0; var4 < var3; ++var4) { + var1 *= 37L; + char var5 = var0.charAt(var4); + if (var5 >= 'A' && var5 <= 'Z') { + var1 += (long)(var5 + 1 - 65); + } else if (var5 >= 'a' && var5 <= 'z') { + var1 += (long)(var5 + 1 - 97); + } else if (var5 >= '0' && var5 <= '9') { + var1 += (long)(var5 + 27 - 48); + } + + if (var1 >= 177917621779460413L) { + break; + } + } + + while (var1 % 37L == 0L && var1 != 0L) { + var1 /= 37L; + } + + return var1; + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "(Lif;IIIBZI)V", + garbageValue = "-2034878467" + ) + @Export("requestNetFile") + static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) { + long var6 = (long)((var1 << 16) + var2); + NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); + if (var8 == null) { + var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); + if (var8 == null) { + var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); + if (var8 != null) { + if (var5) { + var8.removeDual(); + NetCache.NetCache_pendingPriorityWrites.put(var8, var6); + --NetCache.NetCache_pendingWritesCount; + ++NetCache.NetCache_pendingPriorityWritesCount; + } + + } else { + if (!var5) { + var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); + if (var8 != null) { + return; + } + } + + var8 = new NetFileRequest(); + var8.archive = var0; + var8.crc = var3; + var8.padding = var4; + if (var5) { + NetCache.NetCache_pendingPriorityWrites.put(var8, var6); + ++NetCache.NetCache_pendingPriorityWritesCount; + } else { + NetCache.NetCache_pendingWritesQueue.addFirst(var8); + NetCache.NetCache_pendingWrites.put(var8, var6); + ++NetCache.NetCache_pendingWritesCount; + } + + } } } } - @ObfuscatedName("ki") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "([BIB)V", - garbageValue = "-41" + signature = "(B)V", + garbageValue = "118" ) - static void method4200(byte[] var0, int var1) { - if (Client.randomDatData == null) { - Client.randomDatData = new byte[24]; - } + public static void method4100() { + HealthBarDefinition.HealthBarDefinition_cached.clear(); + HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); + } - class300.writeRandomDat(var0, var1, Client.randomDatData, 0, 24); + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "-39" + ) + public static final void method4099() { + ViewportMouse.ViewportMouse_isInViewport = false; + ViewportMouse.ViewportMouse_entityCount = 0; } } diff --git a/runescape-client/src/main/java/class227.java b/runescape-client/src/main/java/class227.java index 4caafcd025..28cc29a023 100644 --- a/runescape-client/src/main/java/class227.java +++ b/runescape-client/src/main/java/class227.java @@ -1,11 +1,14 @@ -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hp") +@ObfuscatedName("hk") public final class class227 { - @ObfuscatedName("gy") - @ObfuscatedGetter( - intValue = 439347683 + @ObfuscatedName("b") + @ObfuscatedSignature( + signature = "(CI)Z", + garbageValue = "-2145751121" ) - static int field3092; + static boolean method4102(char var0) { + return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var0) != -1; + } } diff --git a/runescape-client/src/main/java/class237.java b/runescape-client/src/main/java/class237.java index 232cbc3264..ae7ac063cb 100644 --- a/runescape-client/src/main/java/class237.java +++ b/runescape-client/src/main/java/class237.java @@ -1,121 +1,129 @@ -import java.net.URL; import java.util.HashMap; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("if") +@ObfuscatedName("ic") public class class237 { - @ObfuscatedName("u") + @ObfuscatedName("a") + static int[] field3164; + @ObfuscatedName("f") @Export("spriteMap") final HashMap spriteMap; - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Llw;" + signature = "Llh;" ) @Export("bounds") Bounds bounds; - @ObfuscatedName("b") - int[] field3192; - @ObfuscatedName("g") - int[] field3193; - @ObfuscatedName("z") + @ObfuscatedName("y") + int[] field3160; + @ObfuscatedName("w") + int[] field3161; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 136920125 + intValue = -1798727119 ) - int field3196; + int field3162; public class237() { this.spriteMap = new HashMap(); this.bounds = new Bounds(0, 0); - this.field3192 = new int[2048]; - this.field3193 = new int[2048]; - this.field3196 = 0; - WorldMapSectionType.method265(); + this.field3160 = new int[2048]; + this.field3161 = new int[2048]; + this.field3162 = 0; + field3164 = new int[2000]; + int var1 = 0; + int var2 = 240; + + int var4; + for (byte var3 = 12; var1 < 16; var2 -= var3) { + var4 = Tiles.method1121((double)((float)var2 / 360.0F), 0.9998999834060669D, (double)((float)var1 * 0.425F / 16.0F + 0.075F)); + field3164[var1] = var4; + ++var1; + } + + var2 = 48; + + for (int var6 = var2 / 6; var1 < field3164.length; var2 -= var6) { + var4 = var1 * 2; + + for (int var5 = Tiles.method1121((double)((float)var2 / 360.0F), 0.9998999834060669D, 0.5D); var1 < var4 && var1 < field3164.length; ++var1) { + field3164[var1] = var5; + } + } + } @ObfuscatedName("f") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-1518977792" + garbageValue = "2086190547" ) - void method4404(int var1) { + void method4301(int var1) { int var2 = var1 * 2 + 1; - double var4 = (double)((float)var1 / 3.0F); - int var6 = var1 * 2 + 1; - double[] var7 = new double[var6]; - int var8 = -var1; + double[] var3 = class289.method5336(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 var9 = 0; var8 <= var1; ++var9) { - double var16 = (double)(var8 - 0) / var4; - double var14 = Math.exp(var16 * -var16 / 2.0D) / Math.sqrt(6.283185307179586D); - double var12 = var14 / var4; - var7[var9] = var12; - ++var8; - } - - double[] var18 = var7; - double var19 = var7[var1] * var7[var1]; - int[] var21 = new int[var2 * var2]; - boolean var22 = false; - - for (int var11 = 0; var11 < var2; ++var11) { - for (int var23 = 0; var23 < var2; ++var23) { - int var13 = var21[var23 + var11 * var2] = (int)(256.0D * (var18[var11] * var18[var23] / var19)); - if (!var22 && var13 > 0) { - var22 = true; + for (int var8 = 0; var8 < var2; ++var8) { + for (int var9 = 0; var9 < var2; ++var9) { + int var10 = var6[var9 + var8 * var2] = (int)(var3[var8] * var3[var9] / var4 * 256.0D); + if (!var7 && var10 > 0) { + var7 = true; } } } - Sprite var24 = new Sprite(var21, var2, var2); - this.spriteMap.put(var1, var24); + Sprite var11 = new Sprite(var6, var2, var2); + this.spriteMap.put(var1, var11); } - @ObfuscatedName("b") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IS)Lln;", - garbageValue = "-15422" + signature = "(IB)Lls;", + garbageValue = "-60" ) - Sprite method4405(int var1) { + Sprite method4302(int var1) { if (!this.spriteMap.containsKey(var1)) { - this.method4404(var1); + this.method4301(var1); } return (Sprite)this.spriteMap.get(var1); } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "-106" + signature = "(III)V", + garbageValue = "1391492570" ) - public final void method4406(int var1, int var2) { - if (this.field3196 < this.field3192.length) { - this.field3192[this.field3196] = var1; - this.field3193[this.field3196] = var2; - ++this.field3196; + public final void method4303(int var1, int var2) { + if (this.field3162 < this.field3160.length) { + this.field3160[this.field3162] = var1; + this.field3161[this.field3162] = var2; + ++this.field3162; } } - @ObfuscatedName("z") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1194246226" + garbageValue = "-938639376" ) - public final void method4403() { - this.field3196 = 0; + public final void method4304() { + this.field3162 = 0; } @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(IILln;FI)V", - garbageValue = "-2013920472" + signature = "(IILls;FI)V", + garbageValue = "-501073565" ) - public final void method4408(int var1, int var2, Sprite var3, float var4) { + public final void method4318(int var1, int var2, Sprite var3, float var4) { int var5 = (int)(var4 * 18.0F); - Sprite var6 = this.method4405(var5); + Sprite var6 = this.method4302(var5); int var7 = var5 * 2 + 1; Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); Bounds var9 = new Bounds(0, 0); @@ -125,14 +133,14 @@ public class class237 { int var10; int var11; int var12; - for (var10 = 0; var10 < this.field3196; ++var10) { - var11 = this.field3192[var10]; - var12 = this.field3193[var10]; - int var13 = (int)((float)(var11 - var1) * var4) - var5; + for (var10 = 0; var10 < this.field3162; ++var10) { + var11 = this.field3160[var10]; + var12 = this.field3161[var10]; + int var13 = (int)(var4 * (float)(var11 - var1)) - var5; int var14 = (int)((float)var3.subHeight - var4 * (float)(var12 - var2)) - var5; this.bounds.setLow(var13, var14); - this.bounds.method6069(var8, var9); - this.method4409(var6, var3, var9); + this.bounds.method5997(var8, var9); + this.method4306(var6, var3, var9); } System.nanoTime(); @@ -146,11 +154,11 @@ public class class237 { if (var11 <= 0) { var3.pixels[var10] = -16777216; } else { - if (var11 > Skeleton.field1788.length) { - var11 = Skeleton.field1788.length; + if (var11 > field3164.length) { + var11 = field3164.length; } - var12 = Skeleton.field1788[var11 - 1]; + var12 = field3164[var11 - 1]; var3.pixels[var10] = -16777216 | var12; } } @@ -159,12 +167,12 @@ public class class237 { System.nanoTime(); } - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(Lln;Lln;Llw;I)V", - garbageValue = "244697744" + signature = "(Lls;Lls;Llh;I)V", + garbageValue = "-17705083" ) - void method4409(Sprite var1, Sprite var2, Bounds var3) { + void method4306(Sprite var1, Sprite var2, Bounds var3) { if (var3.highX != 0 && var3.highY != 0) { int var4 = 0; int var5 = 0; @@ -193,71 +201,23 @@ public class class237 { } } - @ObfuscatedName("g") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljava/lang/String;ILjava/lang/String;B)Z", - garbageValue = "-79" + signature = "(CI)Z", + garbageValue = "1561661467" ) - static boolean method4422(String var0, int var1, String var2) { - if (var1 == 0) { - try { - if (!class51.field424.startsWith("win")) { - throw new Exception(); - } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { - throw new Exception(); - } else { - String var10 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; - - for (int var4 = 0; var4 < var0.length(); ++var4) { - if (var10.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 var3 = class47.method865(class51.applet, var2, new Object[]{(new URL(class51.applet.getCodeBase(), var0)).toString()}); - return var3 != 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 { - class47.method864(class51.applet, "loggedout"); - } 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(); - } + @Export("isDigit") + public static boolean isDigit(char var0) { + return var0 >= '0' && var0 <= '9'; } - @ObfuscatedName("h") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-152675892" + garbageValue = "-1306967480" ) - public static void method4421() { - HealthBarDefinition.HealthBarDefinition_cached.clear(); - HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); + public static void method4300() { + NPCDefinition.NpcDefinition_cached.clear(); + NPCDefinition.NpcDefinition_cachedModels.clear(); } } diff --git a/runescape-client/src/main/java/class247.java b/runescape-client/src/main/java/class247.java index f7971b04b5..832b919a77 100644 --- a/runescape-client/src/main/java/class247.java +++ b/runescape-client/src/main/java/class247.java @@ -1,10 +1,15 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("iv") +@ObfuscatedName("iu") public class class247 { - @ObfuscatedName("u") - static boolean method4577(long var0) { - int var2 = (int)(var0 >>> 14 & 3L); - return var2 == 2; - } + @ObfuscatedName("w") + @Export("Interpreter_stringLocals") + static String[] Interpreter_stringLocals; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 1864596047 + ) + static int field3261; } diff --git a/runescape-client/src/main/java/class266.java b/runescape-client/src/main/java/class266.java index e29db1326b..97ff564cff 100644 --- a/runescape-client/src/main/java/class266.java +++ b/runescape-client/src/main/java/class266.java @@ -1,52 +1,11 @@ -import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jy") +@ObfuscatedName("jn") public class class266 { - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "Lhf;" + @ObfuscatedName("ab") + @ObfuscatedGetter( + intValue = -1184737469 ) - @Export("ItemDefinition_modelArchive") - static AbstractArchive ItemDefinition_modelArchive; - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(IIII)I", - garbageValue = "1187459015" - ) - public static int method5065(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; - } - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "-67" - ) - static final int method5066(int var0, int var1) { - int var2 = GrandExchangeOfferWorldComparator.method76(var0 - 1, var1 - 1) + GrandExchangeOfferWorldComparator.method76(1 + var0, var1 - 1) + GrandExchangeOfferWorldComparator.method76(var0 - 1, 1 + var1) + GrandExchangeOfferWorldComparator.method76(1 + var0, var1 + 1); - int var3 = GrandExchangeOfferWorldComparator.method76(var0 - 1, var1) + GrandExchangeOfferWorldComparator.method76(1 + var0, var1) + GrandExchangeOfferWorldComparator.method76(var0, var1 - 1) + GrandExchangeOfferWorldComparator.method76(var0, 1 + var1); - int var4 = GrandExchangeOfferWorldComparator.method76(var0, var1); - return var2 / 16 + var3 / 8 + var4 / 4; - } - - @ObfuscatedName("es") - @ObfuscatedSignature( - signature = "(Lij;Ljava/lang/String;I)V", - garbageValue = "-1313176939" - ) - static void method5064(Archive var0, String var1) { - ArchiveLoader var2 = new ArchiveLoader(var0, var1); - Client.archiveLoaders.add(var2); - Client.field914 += var2.groupCount; - } + static int field3517; } diff --git a/runescape-client/src/main/java/class267.java b/runescape-client/src/main/java/class267.java index 38eb764feb..dfbdd8d0a2 100644 --- a/runescape-client/src/main/java/class267.java +++ b/runescape-client/src/main/java/class267.java @@ -1,451 +1,11 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("jc") +@ObfuscatedName("jh") public class class267 { - @ObfuscatedName("dv") + @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "Lij;" + signature = "Llh;" ) - @Export("archive12") - static Archive archive12; - - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "(ILci;ZI)I", - garbageValue = "2022043883" - ) - static int method5067(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { - var3 = Language.getWidget(Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]); - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.itemId; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { - var3 = Language.getWidget(Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]); - if (var3.itemId != -1) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.itemQuantity; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.IF_HASSUB) { - int var5 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var5); - if (var4 != null) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.IF_GETTOP) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Client.rootInterface; - return 1; - } else { - return 2; - } - } - - @ObfuscatedName("hm") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "8" - ) - static final void method5068() { - InterfaceParent.method1197(false); - Client.field676 = 0; - boolean var0 = true; - - int var1; - for (var1 = 0; var1 < VerticalAlignment.regionLandArchives.length; ++var1) { - if (BuddyRankComparator.regionMapArchiveIds[var1] != -1 && VerticalAlignment.regionLandArchives[var1] == null) { - VerticalAlignment.regionLandArchives[var1] = DirectByteArrayCopier.archive5.takeFile(BuddyRankComparator.regionMapArchiveIds[var1], 0); - if (VerticalAlignment.regionLandArchives[var1] == null) { - var0 = false; - ++Client.field676; - } - } - - if (GrandExchangeOfferAgeComparator.regionLandArchiveIds[var1] != -1 && UrlRequest.regionMapArchives[var1] == null) { - UrlRequest.regionMapArchives[var1] = DirectByteArrayCopier.archive5.takeFileEncrypted(GrandExchangeOfferAgeComparator.regionLandArchiveIds[var1], 0, WorldMapIcon_0.xteaKeys[var1]); - if (UrlRequest.regionMapArchives[var1] == null) { - var0 = false; - ++Client.field676; - } - } - } - - if (!var0) { - Client.field699 = 1; - } else { - Client.field850 = 0; - var0 = true; - - int var3; - int var4; - for (var1 = 0; var1 < VerticalAlignment.regionLandArchives.length; ++var1) { - byte[] var2 = UrlRequest.regionMapArchives[var1]; - if (var2 != null) { - var3 = (class226.regions[var1] >> 8) * 64 - class51.baseX * 64; - var4 = (class226.regions[var1] & 255) * 64 - VarcInt.baseY * 64; - if (Client.isInInstance) { - var3 = 10; - var4 = 10; - } - - var0 &= Script.method2257(var2, var3, var4); - } - } - - if (!var0) { - Client.field699 = 2; - } else { - if (Client.field699 != 0) { - WorldMapIcon_1.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); - } - - Tiles.playPcmPlayers(); - class2.scene.clear(); - - for (var1 = 0; var1 < 4; ++var1) { - Client.collisionMaps[var1].clear(); - } - - int var31; - for (var1 = 0; var1 < 4; ++var1) { - for (var31 = 0; var31 < 104; ++var31) { - for (var3 = 0; var3 < 104; ++var3) { - Tiles.Tiles_renderFlags[var1][var31][var3] = 0; - } - } - } - - Tiles.playPcmPlayers(); - Tiles.Tiles_minPlane = 99; - Tiles.field498 = new byte[4][104][104]; - Tiles.field499 = new byte[4][104][104]; - Tiles.field500 = new byte[4][104][104]; - Tiles.field501 = new byte[4][104][104]; - WorldMapLabel.field233 = new int[4][105][105]; - class51.field423 = new byte[4][105][105]; - Login.field1207 = new int[105][105]; - Tiles.Tiles_hue = new int[104]; - Tiles.Tiles_saturation = new int[104]; - Tiles.Tiles_lightness = new int[104]; - class290.Tiles_hueMultiplier = new int[104]; - MouseRecorder.field588 = new int[104]; - var1 = VerticalAlignment.regionLandArchives.length; - - for (ObjectSound var41 = (ObjectSound)ObjectSound.objectSounds.last(); var41 != null; var41 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var41.stream1 != null) { - ClientPacket.pcmStreamMixer.removeSubStream(var41.stream1); - var41.stream1 = null; - } - - if (var41.stream2 != null) { - ClientPacket.pcmStreamMixer.removeSubStream(var41.stream2); - var41.stream2 = null; - } - } - - ObjectSound.objectSounds.clear(); - InterfaceParent.method1197(true); - int var9; - int var10; - int var11; - int var12; - int var14; - int var15; - int var16; - int var17; - int var19; - int var20; - int var21; - int var32; - if (!Client.isInInstance) { - byte[] var5; - for (var31 = 0; var31 < var1; ++var31) { - var3 = (class226.regions[var31] >> 8) * 64 - class51.baseX * 64; - var4 = (class226.regions[var31] & 255) * 64 - VarcInt.baseY * 64; - var5 = VerticalAlignment.regionLandArchives[var31]; - if (var5 != null) { - Tiles.playPcmPlayers(); - GrandExchangeOffer.method123(var5, var3, var4, CollisionMap.field2086 * 8 - 48, SoundCache.field1438 * 8 - 48, Client.collisionMaps); - } - } - - for (var31 = 0; var31 < var1; ++var31) { - var3 = (class226.regions[var31] >> 8) * 64 - class51.baseX * 64; - var4 = (class226.regions[var31] & 255) * 64 - VarcInt.baseY * 64; - var5 = VerticalAlignment.regionLandArchives[var31]; - if (var5 == null && SoundCache.field1438 < 800) { - Tiles.playPcmPlayers(); - ReflectionCheck.method2316(var3, var4, 64, 64); - } - } - - InterfaceParent.method1197(true); - - for (var31 = 0; var31 < var1; ++var31) { - byte[] var33 = UrlRequest.regionMapArchives[var31]; - if (var33 != null) { - var4 = (class226.regions[var31] >> 8) * 64 - class51.baseX * 64; - var32 = (class226.regions[var31] & 255) * 64 - VarcInt.baseY * 64; - Tiles.playPcmPlayers(); - Scene var34 = class2.scene; - CollisionMap[] var35 = Client.collisionMaps; - Buffer var36 = new Buffer(var33); - var9 = -1; - - while (true) { - var10 = var36.method5710(); - if (var10 == 0) { - break; - } - - var9 += var10; - var11 = 0; - - while (true) { - var12 = var36.readUShortSmart(); - if (var12 == 0) { - break; - } - - var11 += var12 - 1; - int var38 = var11 & 63; - var14 = var11 >> 6 & 63; - var15 = var11 >> 12; - var16 = var36.readUnsignedByte(); - var17 = var16 >> 2; - int var39 = var16 & 3; - var19 = var14 + var4; - var20 = var38 + var32; - if (var19 > 0 && var20 > 0 && var19 < 103 && var20 < 103) { - var21 = var15; - if ((Tiles.Tiles_renderFlags[1][var19][var20] & 2) == 2) { - var21 = var15 - 1; - } - - CollisionMap var40 = null; - if (var21 >= 0) { - var40 = var35[var21]; - } - - EnumDefinition.method4656(var15, var19, var20, var9, var39, var17, var34, var40); - } - } - } - } - } - } - - int var6; - int var7; - int var8; - if (Client.isInInstance) { - for (var31 = 0; var31 < 4; ++var31) { - Tiles.playPcmPlayers(); - - for (var3 = 0; var3 < 13; ++var3) { - for (var4 = 0; var4 < 13; ++var4) { - boolean var42 = false; - var6 = Client.instanceChunkTemplates[var31][var3][var4]; - if (var6 != -1) { - var7 = var6 >> 24 & 3; - var8 = var6 >> 1 & 3; - var9 = var6 >> 14 & 1023; - var10 = var6 >> 3 & 2047; - var11 = (var9 / 8 << 8) + var10 / 8; - - for (var12 = 0; var12 < class226.regions.length; ++var12) { - if (class226.regions[var12] == var11 && VerticalAlignment.regionLandArchives[var12] != null) { - byte[] var13 = VerticalAlignment.regionLandArchives[var12]; - var14 = var3 * 8; - var15 = var4 * 8; - var16 = (var9 & 7) * 8; - var17 = (var10 & 7) * 8; - CollisionMap[] var18 = Client.collisionMaps; - - for (var19 = 0; var19 < 8; ++var19) { - for (var20 = 0; var20 < 8; ++var20) { - if (var19 + var14 > 0 && var19 + var14 < 103 && var15 + var20 > 0 && var20 + var15 < 103) { - int[] var10000 = var18[var31].flags[var14 + var19]; - var10000[var20 + var15] &= -16777217; - } - } - } - - Buffer var37 = new Buffer(var13); - - for (var20 = 0; var20 < 4; ++var20) { - for (var21 = 0; var21 < 64; ++var21) { - for (int var22 = 0; var22 < 64; ++var22) { - if (var7 == var20 && var21 >= var16 && var21 < var16 + 8 && var22 >= var17 && var22 < var17 + 8) { - int var25 = var14 + class266.method5065(var21 & 7, var22 & 7, var8); - int var28 = var21 & 7; - int var29 = var22 & 7; - int var30 = var8 & 3; - int var27; - if (var30 == 0) { - var27 = var29; - } else if (var30 == 1) { - var27 = 7 - var28; - } else if (var30 == 2) { - var27 = 7 - var29; - } else { - var27 = var28; - } - - GrandExchangeOffer.loadTerrain(var37, var31, var25, var15 + var27, 0, 0, var8); - } else { - GrandExchangeOffer.loadTerrain(var37, 0, -1, -1, 0, 0, 0); - } - } - } - } - - var42 = true; - break; - } - } - } - - if (!var42) { - TilePaint.method3105(var31, var3 * 8, var4 * 8); - } - } - } - } - - for (var31 = 0; var31 < 13; ++var31) { - for (var3 = 0; var3 < 13; ++var3) { - var4 = Client.instanceChunkTemplates[0][var31][var3]; - if (var4 == -1) { - ReflectionCheck.method2316(var31 * 8, var3 * 8, 8, 8); - } - } - } - - InterfaceParent.method1197(true); - - for (var31 = 0; var31 < 4; ++var31) { - Tiles.playPcmPlayers(); - - for (var3 = 0; var3 < 13; ++var3) { - for (var4 = 0; var4 < 13; ++var4) { - var32 = Client.instanceChunkTemplates[var31][var3][var4]; - if (var32 != -1) { - var6 = var32 >> 24 & 3; - var7 = var32 >> 1 & 3; - var8 = var32 >> 14 & 1023; - var9 = var32 >> 3 & 2047; - var10 = (var8 / 8 << 8) + var9 / 8; - - for (var11 = 0; var11 < class226.regions.length; ++var11) { - if (class226.regions[var11] == var10 && UrlRequest.regionMapArchives[var11] != null) { - FileSystem.method3552(UrlRequest.regionMapArchives[var11], var31, var3 * 8, var4 * 8, var6, (var8 & 7) * 8, (var9 & 7) * 8, var7, class2.scene, Client.collisionMaps); - break; - } - } - } - } - } - } - } - - InterfaceParent.method1197(true); - Tiles.playPcmPlayers(); - Frames.method3319(class2.scene, Client.collisionMaps); - InterfaceParent.method1197(true); - var31 = Tiles.Tiles_minPlane; - if (var31 > ClientPacket.Client_plane) { - var31 = ClientPacket.Client_plane; - } - - if (var31 < ClientPacket.Client_plane - 1) { - var31 = ClientPacket.Client_plane - 1; - } - - if (Client.isLowDetail) { - class2.scene.init(Tiles.Tiles_minPlane); - } else { - class2.scene.init(0); - } - - for (var3 = 0; var3 < 104; ++var3) { - for (var4 = 0; var4 < 104; ++var4) { - HealthBar.updateItemPile(var3, var4); - } - } - - Tiles.playPcmPlayers(); - - for (PendingSpawn var43 = (PendingSpawn)Client.pendingSpawns.last(); var43 != null; var43 = (PendingSpawn)Client.pendingSpawns.previous()) { - if (var43.hitpoints == -1) { - var43.delay = 0; - class215.method4108(var43); - } else { - var43.remove(); - } - } - - ObjectDefinition.ObjectDefinition_cachedModelData.clear(); - PacketBufferNode var44; - if (AbstractWorldMapIcon.client.hasFrame()) { - var44 = ModelData0.getPacketBufferNode(ClientPacket.field2260, Client.packetWriter.isaacCipher); - var44.packetBuffer.writeInt(1057001181); - Client.packetWriter.addNode(var44); - } - - if (!Client.isInInstance) { - var3 = (CollisionMap.field2086 - 6) / 8; - var4 = (CollisionMap.field2086 + 6) / 8; - var32 = (SoundCache.field1438 - 6) / 8; - var6 = (SoundCache.field1438 + 6) / 8; - - for (var7 = var3 - 1; var7 <= var4 + 1; ++var7) { - for (var8 = var32 - 1; var8 <= var6 + 1; ++var8) { - if (var7 < var3 || var7 > var4 || var8 < var32 || var8 > var6) { - DirectByteArrayCopier.archive5.loadRegionFromName("m" + var7 + "_" + var8); - DirectByteArrayCopier.archive5.loadRegionFromName("l" + var7 + "_" + var8); - } - } - } - } - - class81.updateGameState(30); - Tiles.playPcmPlayers(); - Tiles.field498 = null; - Tiles.field499 = null; - Tiles.field500 = null; - Tiles.field501 = null; - WorldMapLabel.field233 = null; - class51.field423 = null; - Login.field1207 = null; - Tiles.Tiles_hue = null; - Tiles.Tiles_saturation = null; - Tiles.Tiles_lightness = null; - class290.Tiles_hueMultiplier = null; - MouseRecorder.field588 = null; - var44 = ModelData0.getPacketBufferNode(ClientPacket.field2223, Client.packetWriter.isaacCipher); - Client.packetWriter.addNode(var44); - BuddyRankComparator.clock.mark(); - - for (var4 = 0; var4 < 32; ++var4) { - GameShell.graphicsTickTimes[var4] = 0L; - } - - for (var4 = 0; var4 < 32; ++var4) { - GameShell.clientTickTimes[var4] = 0L; - } - - GameShell.gameCyclesToDo = 0; - } - } - } + static Bounds field3521; } diff --git a/runescape-client/src/main/java/class269.java b/runescape-client/src/main/java/class269.java index 9e9b557738..581f9fa574 100644 --- a/runescape-client/src/main/java/class269.java +++ b/runescape-client/src/main/java/class269.java @@ -2,12 +2,91 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jk") +@ObfuscatedName("jp") public class class269 { - @ObfuscatedName("dg") + @ObfuscatedName("sf") + @Export("foundItemIds") + static short[] foundItemIds; + + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lij;" + signature = "(IIIZIZI)V", + garbageValue = "1979795813" ) - @Export("archive13") - static Archive archive13; + @Export("doWorldSorting") + static void doWorldSorting(int var0, int var1, int var2, boolean var3, int var4, boolean var5) { + if (var0 < var1) { + int var6 = (var0 + var1) / 2; + int var7 = var0; + World var8 = class162.World_worlds[var6]; + class162.World_worlds[var6] = class162.World_worlds[var1]; + class162.World_worlds[var1] = var8; + + for (int var9 = var0; var9 < var1; ++var9) { + World var11 = class162.World_worlds[var9]; + int var12 = Player.compareWorlds(var11, var8, var2, var3); + int var10; + if (var12 != 0) { + if (var3) { + var10 = -var12; + } else { + var10 = var12; + } + } else if (var4 == -1) { + var10 = 0; + } else { + int var13 = Player.compareWorlds(var11, var8, var4, var5); + if (var5) { + var10 = -var13; + } else { + var10 = var13; + } + } + + if (var10 <= 0) { + World var14 = class162.World_worlds[var9]; + class162.World_worlds[var9] = class162.World_worlds[var7]; + class162.World_worlds[var7++] = var14; + } + } + + class162.World_worlds[var1] = class162.World_worlds[var7]; + class162.World_worlds[var7] = var8; + doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); + doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); + } + + } + + @ObfuscatedName("ga") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1859610871" + ) + static final void method5014() { + int[] var0 = Players.Players_indices; + + int var1; + for (var1 = 0; var1 < Players.Players_count; ++var1) { + Player var2 = Client.players[var0[var1]]; + if (var2 != null && var2.overheadTextCyclesRemaining > 0) { + --var2.overheadTextCyclesRemaining; + if (var2.overheadTextCyclesRemaining == 0) { + var2.overheadText = null; + } + } + } + + for (var1 = 0; var1 < Client.npcCount; ++var1) { + int var4 = Client.npcIndices[var1]; + NPC var3 = Client.npcs[var4]; + if (var3 != null && var3.overheadTextCyclesRemaining > 0) { + --var3.overheadTextCyclesRemaining; + if (var3.overheadTextCyclesRemaining == 0) { + var3.overheadText = null; + } + } + } + + } } diff --git a/runescape-client/src/main/java/class270.java b/runescape-client/src/main/java/class270.java deleted file mode 100644 index e46732ffc8..0000000000 --- a/runescape-client/src/main/java/class270.java +++ /dev/null @@ -1,32 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("jo") -public class class270 { - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "-638567292" - ) - @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; - Clock.sortWorlds(Skills.World_worlds, 0, Skills.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); - } -} diff --git a/runescape-client/src/main/java/class286.java b/runescape-client/src/main/java/class286.java index c19495ca79..ca46289541 100644 --- a/runescape-client/src/main/java/class286.java +++ b/runescape-client/src/main/java/class286.java @@ -2,62 +2,22 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kx") +@ObfuscatedName("kt") public class class286 { - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "([I[II)V", - garbageValue = "1632761415" - ) - public static void method5353(int[] var0, int[] var1) { - if (var0 != null && var1 != null) { - WorldMapSprite.ByteArrayPool_alternativeSizes = var0; - class216.ByteArrayPool_altSizeArrayCounts = new int[var0.length]; - ByteArrayPool.ByteArrayPool_arrays = new byte[var0.length][][]; - - for (int var2 = 0; var2 < WorldMapSprite.ByteArrayPool_alternativeSizes.length; ++var2) { - ByteArrayPool.ByteArrayPool_arrays[var2] = new byte[var1[var2]][]; - } - - } else { - WorldMapSprite.ByteArrayPool_alternativeSizes = null; - class216.ByteArrayPool_altSizeArrayCounts = null; - ByteArrayPool.ByteArrayPool_arrays = null; - } - } - @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "-62" + signature = "Lhz;" ) - @Export("ItemContainer_getCount") - static int ItemContainer_getCount(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var2 == null) { - return 0; - } else { - return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; - } - } + @Export("EnumDefinition_archive") + static AbstractArchive EnumDefinition_archive; - @ObfuscatedName("z") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(II)Lba;", - garbageValue = "-1661188846" + signature = "(I)V", + garbageValue = "-1832387594" ) - @Export("Messages_getMessage") - static Message Messages_getMessage(int var0) { - return (Message)Messages.Messages_hashTable.get((long)var0); - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "(IIIII)I", - garbageValue = "1010446499" - ) - static final int method5346(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); + public static void method5310() { + SequenceDefinition.SequenceDefinition_cached.clear(); + SequenceDefinition.SequenceDefinition_cachedFrames.clear(); } } diff --git a/runescape-client/src/main/java/class287.java b/runescape-client/src/main/java/class287.java index bf19fb9196..dc04ef59b9 100644 --- a/runescape-client/src/main/java/class287.java +++ b/runescape-client/src/main/java/class287.java @@ -1,9 +1,9 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("kl") +@ObfuscatedName("kd") public class class287 { - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("cp1252AsciiExtension") public static final char[] cp1252AsciiExtension; diff --git a/runescape-client/src/main/java/class288.java b/runescape-client/src/main/java/class288.java index d73a83e906..32e19d413d 100644 --- a/runescape-client/src/main/java/class288.java +++ b/runescape-client/src/main/java/class288.java @@ -1,96 +1,36 @@ import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kh") +@ObfuscatedName("ke") public final class class288 { - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("base37Table") static final char[] base37Table; - @ObfuscatedName("f") - static long[] field3650; @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -1236461177 - ) - static int field3652; - @ObfuscatedName("dh") - @ObfuscatedSignature( - signature = "Lij;" - ) - @Export("archive2") - static Archive archive2; + static long[] field3631; 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'}; - field3650 = new long[12]; + field3631 = new long[12]; - for (int var0 = 0; var0 < field3650.length; ++var0) { - field3650[var0] = (long)Math.pow(37.0D, (double)var0); + for (int var0 = 0; var0 < field3631.length; ++var0) { + field3631[var0] = (long)Math.pow(37.0D, (double)var0); } } - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "-123" - ) - static int method5383(int var0, int var1) { - FloorOverlayDefinition var2 = WorldMapRectangle.FloorUnderlayDefinition_get(var0); - if (var2 == null) { - return var1; - } else if (var2.secondaryRgb >= 0) { - return var2.secondaryRgb | -16777216; - } else { - int var3; - if (var2.texture >= 0) { - var3 = TilePaint.method3104(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var2.texture), 96); - return Rasterizer3D.Rasterizer3D_colorPalette[var3] | -16777216; - } else if (var2.primaryRgb == 16711935) { - return var1; - } else { - var3 = JagexCache.method3531(var2.hue, var2.saturation, var2.lightness); - byte var5 = 96; - int var4; - if (var3 == -2) { - var4 = 12345678; - } else { - int var7; - if (var3 == -1) { - if (var5 < 0) { - var5 = 0; - } else if (var5 > 127) { - var5 = 127; - } - - var7 = 127 - var5; - var4 = var7; - } else { - var7 = var5 * (var3 & 127) / 128; - if (var7 < 2) { - var7 = 2; - } else if (var7 > 126) { - var7 = 126; - } - - var4 = var7 + (var3 & 65408); - } - } - - return Rasterizer3D.Rasterizer3D_colorPalette[var4] | -16777216; - } - } + @ObfuscatedName("w") + public static int method5334(long var0) { + return (int)(var0 >>> 0 & 127L); } - @ObfuscatedName("b") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lhf;III)Lln;", - garbageValue = "170852381" + signature = "(Ljava/lang/String;B)V", + garbageValue = "56" ) - @Export("SpriteBuffer_getSprite") - public static Sprite SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { - return !GraphicsObject.method2030(var0, var1, var2) ? null : Occluder.method3338(); + static final void method5335(String var0) { + Tiles.method1143(var0 + " is already on your friend list"); } } diff --git a/runescape-client/src/main/java/class289.java b/runescape-client/src/main/java/class289.java index 4eae296b79..a5a146e848 100644 --- a/runescape-client/src/main/java/class289.java +++ b/runescape-client/src/main/java/class289.java @@ -1,168 +1,109 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("km") +@ObfuscatedName("kr") public class class289 { - @ObfuscatedName("u") - static char[] field3653; @ObfuscatedName("f") - static char[] field3656; - @ObfuscatedName("b") - static char[] field3655; - @ObfuscatedName("g") - static int[] field3654; + static char[] field3634; + @ObfuscatedName("i") + static char[] field3636; + @ObfuscatedName("y") + static char[] field3633; + @ObfuscatedName("w") + static int[] field3635; static { - field3653 = new char[64]; + field3634 = new char[64]; int var0; for (var0 = 0; var0 < 26; ++var0) { - field3653[var0] = (char)(var0 + 65); + field3634[var0] = (char)(var0 + 65); } for (var0 = 26; var0 < 52; ++var0) { - field3653[var0] = (char)(var0 + 97 - 26); + field3634[var0] = (char)(var0 + 97 - 26); } for (var0 = 52; var0 < 62; ++var0) { - field3653[var0] = (char)(var0 + 48 - 52); + field3634[var0] = (char)(var0 + 48 - 52); } - field3653[62] = '+'; - field3653[63] = '/'; - field3656 = new char[64]; + field3634[62] = '+'; + field3634[63] = '/'; + field3636 = new char[64]; for (var0 = 0; var0 < 26; ++var0) { - field3656[var0] = (char)(var0 + 65); + field3636[var0] = (char)(var0 + 65); } for (var0 = 26; var0 < 52; ++var0) { - field3656[var0] = (char)(var0 + 97 - 26); + field3636[var0] = (char)(var0 + 97 - 26); } for (var0 = 52; var0 < 62; ++var0) { - field3656[var0] = (char)(var0 + 48 - 52); + field3636[var0] = (char)(var0 + 48 - 52); } - field3656[62] = '*'; - field3656[63] = '-'; - field3655 = new char[64]; + field3636[62] = '*'; + field3636[63] = '-'; + field3633 = new char[64]; for (var0 = 0; var0 < 26; ++var0) { - field3655[var0] = (char)(var0 + 65); + field3633[var0] = (char)(var0 + 65); } for (var0 = 26; var0 < 52; ++var0) { - field3655[var0] = (char)(var0 + 97 - 26); + field3633[var0] = (char)(var0 + 97 - 26); } for (var0 = 52; var0 < 62; ++var0) { - field3655[var0] = (char)(var0 + 48 - 52); + field3633[var0] = (char)(var0 + 48 - 52); } - field3655[62] = '-'; - field3655[63] = '_'; - field3654 = new int[128]; + field3633[62] = '-'; + field3633[63] = '_'; + field3635 = new int[128]; - for (var0 = 0; var0 < field3654.length; ++var0) { - field3654[var0] = -1; + for (var0 = 0; var0 < field3635.length; ++var0) { + field3635[var0] = -1; } for (var0 = 65; var0 <= 90; ++var0) { - field3654[var0] = var0 - 65; + field3635[var0] = var0 - 65; } for (var0 = 97; var0 <= 122; ++var0) { - field3654[var0] = var0 - 97 + 26; + field3635[var0] = var0 - 97 + 26; } for (var0 = 48; var0 <= 57; ++var0) { - field3654[var0] = var0 - 48 + 52; + field3635[var0] = var0 - 48 + 52; } - int[] var2 = field3654; - field3654[43] = 62; + int[] var2 = field3635; + field3635[43] = 62; var2[42] = 62; - int[] var1 = field3654; - field3654[47] = 63; + int[] var1 = field3635; + field3635[47] = 63; var1[45] = 63; } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkg;Ljava/lang/String;B)I", - garbageValue = "61" + signature = "(DDIB)[D", + garbageValue = "-83" ) - public static int method5388(Buffer var0, String var1) { - int var2 = var0.offset; - int var4 = var1.length(); - byte[] var5 = new byte[var4]; + public static double[] method5336(double var0, double var2, int var4) { + int var5 = var4 * 2 + 1; + double[] var6 = new double[var5]; + int var7 = -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; - } + for (int var8 = 0; var7 <= var4; ++var8) { + double var11 = FriendLoginUpdate.method5301(((double)var7 - var0) / var2) / var2; + var6[var8] = var11; + ++var7; } - var0.writeSmartByteShort(var5.length); - var0.offset += class210.huffman.compress(var5, 0, var5.length, var0.array, var0.offset); - return var0.offset - var2; + return var6; } } diff --git a/runescape-client/src/main/java/class290.java b/runescape-client/src/main/java/class290.java index 62334bbfe2..3f52c22823 100644 --- a/runescape-client/src/main/java/class290.java +++ b/runescape-client/src/main/java/class290.java @@ -2,21 +2,18 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kw") +@ObfuscatedName("kf") public final class class290 { - @ObfuscatedName("o") - @Export("Tiles_hueMultiplier") - static int[] Tiles_hueMultiplier; + @ObfuscatedName("a") + @Export("SpriteBuffer_pixels") + public static byte[][] SpriteBuffer_pixels; - @ObfuscatedName("kp") + @ObfuscatedName("bk") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-250466939" + signature = "(Ljava/lang/String;I)I", + garbageValue = "-1637680700" ) - @Export("Clan_leaveChat") - static final void Clan_leaveChat() { - PacketBufferNode var0 = ModelData0.getPacketBufferNode(ClientPacket.field2314, Client.packetWriter.isaacCipher); - var0.packetBuffer.writeByte(0); - Client.packetWriter.addNode(var0); + public static int method5375(String var0) { + return var0.length() + 2; } } diff --git a/runescape-client/src/main/java/class296.java b/runescape-client/src/main/java/class296.java index 2d86e5f9e3..e3d09c811b 100644 --- a/runescape-client/src/main/java/class296.java +++ b/runescape-client/src/main/java/class296.java @@ -1,16 +1,16 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("kk") +@ObfuscatedName("km") public final class class296 { - @ObfuscatedName("u") - @ObfuscatedGetter( - longValue = -6454763268597817631L - ) - static long field3695; @ObfuscatedName("f") @ObfuscatedGetter( - longValue = -1124279977682692331L + longValue = 6863597173679897189L ) - static long field3696; + static long field3687; + @ObfuscatedName("i") + @ObfuscatedGetter( + longValue = -2996809742532727575L + ) + static long field3688; } diff --git a/runescape-client/src/main/java/class297.java b/runescape-client/src/main/java/class297.java index bdbd8ae774..715eea0fce 100644 --- a/runescape-client/src/main/java/class297.java +++ b/runescape-client/src/main/java/class297.java @@ -1,7 +1,13 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kp") +@ObfuscatedName("ks") public class class297 { - @ObfuscatedName("cy") - public static char field3699; + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "Lky;" + ) + @Export("NetCache_socket") + public static AbstractSocket NetCache_socket; } diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java index af898f6c3b..a29ecbd40d 100644 --- a/runescape-client/src/main/java/class3.java +++ b/runescape-client/src/main/java/class3.java @@ -1,358 +1,187 @@ +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("g") +@ObfuscatedName("w") public class class3 implements Enumerated { - @ObfuscatedName("nn") - @ObfuscatedGetter( - intValue = -1636147863 - ) - @Export("widgetDragDuration") - static int widgetDragDuration; - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lg;" - ) - static final class3 field11; @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lg;" + signature = "Lw;" ) - static final class3 field15; - @ObfuscatedName("b") + public static final class3 field19; + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lg;" + signature = "Lw;" ) - static final class3 field13; - @ObfuscatedName("g") + public static final class3 field10; + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "Lw;" + ) + public static final class3 field9; + @ObfuscatedName("dc") + @ObfuscatedSignature( + signature = "Lif;" + ) + @Export("archive8") + static Archive archive8; + @ObfuscatedName("fg") + @ObfuscatedSignature( + signature = "Lko;" + ) + @Export("fontPlain11") + static Font fontPlain11; + @ObfuscatedName("gz") @ObfuscatedGetter( - intValue = 902958513 + intValue = 1624533233 ) - final int field14; - @ObfuscatedName("z") + static int field7; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1999157545 + intValue = 55070651 ) - public final int field19; + final int field15; @ObfuscatedName("p") - public final Class field16; - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "Lu;" + @ObfuscatedGetter( + intValue = -1265968075 ) - final class0 field17; + public final int field11; + @ObfuscatedName("b") + public final Class field12; + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "Lf;" + ) + final class0 field13; static { - field11 = new class3(0, 0, Integer.class, new class1()); - field15 = new class3(2, 1, Long.class, new class2()); - field13 = new class3(1, 2, String.class, new class4()); + field19 = new class3(1, 0, Integer.class, new class1()); + field10 = new class3(2, 1, Long.class, new class2()); + field9 = new class3(0, 2, String.class, new class4()); } @ObfuscatedSignature( - signature = "(IILjava/lang/Class;Lu;)V" + signature = "(IILjava/lang/Class;Lf;)V" ) class3(int var1, int var2, Class var3, class0 var4) { - this.field14 = var1; - this.field19 = var2; - this.field16 = var3; - this.field17 = var4; + this.field15 = var1; + this.field11 = var2; + this.field12 = var3; + this.field13 = var4; } - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "7" + garbageValue = "-57" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field19; + return this.field11; } - @ObfuscatedName("z") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Lkg;I)Ljava/lang/Object;", - garbageValue = "-1145343659" + signature = "(Lkq;I)Ljava/lang/Object;", + garbageValue = "868872918" ) - public Object method40(Buffer var1) { - return this.field17.vmethod65(var1); - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(I)[Lg;", - garbageValue = "1593931350" - ) - public static class3[] method45() { - return new class3[]{field15, field11, field13}; - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "([Ljava/lang/String;[SB)V", - garbageValue = "94" - ) - public static void method42(String[] var0, short[] var1) { - Fonts.sortItemsByName(var0, var1, 0, var0.length - 1); + public Object method38(Buffer var1) { + return this.field13.vmethod60(var1); } @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Ljava/lang/Object;Lkg;B)V", - garbageValue = "-56" + signature = "(Ljava/lang/CharSequence;B)I", + garbageValue = "-26" ) - public static void method37(Object var0, Buffer var1) { - class0 var2 = method38(var0.getClass()); - var2.vmethod57(var0, var1); - } + public static int method35(CharSequence var0) { + int var1 = var0.length(); + int var2 = 0; - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "(Ljava/lang/Class;I)Lu;", - garbageValue = "-1298257159" - ) - static class0 method38(Class var0) { - class3[] var2 = method45(); - int var3 = 0; - - class3 var1; - while (true) { - if (var3 >= var2.length) { - var1 = null; - break; + for (int var3 = 0; var3 < var1; ++var3) { + char var4 = var0.charAt(var3); + if (var4 <= 127) { + ++var2; + } else if (var4 <= 2047) { + var2 += 2; + } else { + var2 += 3; } - - class3 var4 = var2[var3]; - if (var4.field16 == var0) { - var1 = var4; - break; - } - - ++var3; } - if (var1 == null) { + return var2; + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "(Ljava/lang/Object;Lkq;I)V", + garbageValue = "911012912" + ) + public static void method36(Object var0, Buffer var1) { + Class var3 = var0.getClass(); + class3[] var5 = new class3[]{field19, field9, field10}; + class3[] var6 = var5; + int var7 = 0; + + class3 var4; + while (true) { + if (var7 >= var6.length) { + var4 = null; + break; + } + + class3 var8 = var6[var7]; + if (var3 == var8.field12) { + var4 = var8; + break; + } + + ++var7; + } + + if (var4 == null) { throw new IllegalArgumentException(); } else { - return var1.field17; + class0 var2 = var4.field13; + var2.vmethod53(var0, var1); } } - @ObfuscatedName("p") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "56484455" + signature = "(Ljava/applet/Applet;Ljava/lang/String;I)V", + garbageValue = "1416761199" ) - public static void method35() { - ParamDefinition.ParamDefinition_cached.clear(); + public static void method39(Applet var0, String var1) { + class50.applet = var0; + if (var1 != null) { + class50.field410 = var1; + } + } - @ObfuscatedName("ft") + @ObfuscatedName("gf") @ObfuscatedSignature( - signature = "(Lbt;II)V", - garbageValue = "-1136770233" + signature = "(Lbv;I)V", + garbageValue = "-6957395" ) - @Export("updateActorSequence") - static final void updateActorSequence(Actor var0, int var1) { - SequenceDefinition var2; - int var3; - int var4; - int var11; - if (var0.field934 > Client.cycle) { - UserComparator5.method3461(var0); - } else if (var0.field982 >= Client.cycle) { - WorldMapAreaData.method707(var0); - } else { - var0.movementSequence = var0.readySequence; - if (var0.pathLength == 0) { - var0.field976 = 0; - } else { - label545: { - if (var0.sequence != -1 && var0.sequenceDelay == 0) { - var2 = GrandExchangeOfferAgeComparator.SequenceDefinition_get(var0.sequence); - if (var0.field994 > 0 && var2.field3531 == 0) { - ++var0.field976; - break label545; - } - - if (var0.field994 <= 0 && var2.field3515 == 0) { - ++var0.field976; - break label545; - } - } - - var11 = var0.x; - var3 = var0.y; - var4 = var0.pathX[var0.pathLength - 1] * 128 + var0.field938 * 64; - int var5 = var0.pathY[var0.pathLength - 1] * 128 + var0.field938 * 64; - if (var11 < var4) { - if (var3 < var5) { - var0.orientation = 1280; - } else if (var3 > var5) { - var0.orientation = 1792; - } else { - var0.orientation = 1536; - } - } else if (var11 > 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 var6 = var0.pathTraversed[var0.pathLength - 1]; - if (var4 - var11 <= 256 && var4 - var11 >= -256 && var5 - var3 <= 256 && var5 - var3 >= -256) { - int var7 = var0.orientation - var0.rotation & 2047; - if (var7 > 1024) { - var7 -= 2048; - } - - int var8 = var0.walkBackSequence; - if (var7 >= -256 && var7 <= 256) { - var8 = var0.walkSequence; - } else if (var7 >= 256 && var7 < 768) { - var8 = var0.walkRightSequence; - } else if (var7 >= -768 && var7 <= -256) { - var8 = var0.walkLeftSequence; - } - - if (var8 == -1) { - var8 = var0.walkSequence; - } - - var0.movementSequence = var8; - int var9 = 4; - boolean var10 = true; - if (var0 instanceof NPC) { - var10 = ((NPC)var0).definition.isClickable; - } - - if (var10) { - if (var0.orientation != var0.rotation && var0.targetIndex == -1 && var0.field988 != 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 (var6 == 2) { - var9 <<= 1; - } - - if (var9 >= 8 && var0.movementSequence == var0.walkSequence && var0.runSequence != -1) { - var0.movementSequence = var0.runSequence; - } - - if (var4 != var11 || var3 != var5) { - if (var11 < var4) { - var0.x += var9; - if (var0.x > var4) { - var0.x = var4; - } - } else if (var11 > var4) { - var0.x -= var9; - if (var0.x < var4) { - var0.x = var4; - } - } - - if (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.field994 > 0) { - --var0.field994; - } - } - } else { - var0.x = var4; - var0.y = var5; - --var0.pathLength; - if (var0.field994 > 0) { - --var0.field994; - } - } - } - } - } - - if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { - var0.sequence = -1; - var0.spotAnimation = -1; - var0.field934 = 0; - var0.field982 = 0; - var0.x = var0.pathX[0] * 128 + var0.field938 * 64; - var0.y = var0.pathY[0] * 128 + var0.field938 * 64; - var0.method1759(); - } - - if (class215.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { - var0.sequence = -1; - var0.spotAnimation = -1; - var0.field934 = 0; - var0.field982 = 0; - var0.x = var0.pathX[0] * 128 + var0.field938 * 64; - var0.y = var0.pathY[0] * 128 + var0.field938 * 64; - var0.method1759(); - } - - if (var0.field988 != 0) { + static final void method48(Actor var0) { + if (var0.field968 != 0) { if (var0.targetIndex != -1) { - Object var13 = null; + Object var1 = null; if (var0.targetIndex < 32768) { - var13 = Client.npcs[var0.targetIndex]; + var1 = Client.npcs[var0.targetIndex]; } else if (var0.targetIndex >= 32768) { - var13 = Client.players[var0.targetIndex - 32768]; + var1 = Client.players[var0.targetIndex - 32768]; } - if (var13 != null) { - var3 = var0.x - ((Actor)var13).x; - var4 = var0.y - ((Actor)var13).y; - if (var3 != 0 || var4 != 0) { - var0.orientation = (int)(Math.atan2((double)var3, (double)var4) * 325.949D) & 2047; + 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; @@ -360,29 +189,29 @@ public class class3 implements Enumerated { } } - if (var0.field965 != -1 && (var0.pathLength == 0 || var0.field976 > 0)) { - var0.orientation = var0.field965; - var0.field965 = -1; + if (var0.field960 != -1 && (var0.pathLength == 0 || var0.field980 > 0)) { + var0.orientation = var0.field960; + var0.field960 = -1; } - var11 = var0.orientation - var0.rotation & 2047; - if (var11 == 0 && var0.false0) { + int var4 = var0.orientation - var0.rotation & 2047; + if (var4 == 0 && var0.false0) { var0.targetIndex = -1; var0.false0 = false; } - if (var11 != 0) { - ++var0.field987; - boolean var14; - if (var11 > 1024) { - var0.rotation -= var0.field988; - var14 = true; - if (var11 < var0.field988 || var11 > 2048 - var0.field988) { + if (var4 != 0) { + ++var0.field974; + boolean var6; + if (var4 > 1024) { + var0.rotation -= var0.field968; + var6 = true; + if (var4 < var0.field968 || var4 > 2048 - var0.field968) { var0.rotation = var0.orientation; - var14 = false; + var6 = false; } - if (var0.readySequence == var0.movementSequence && (var0.field987 > 25 || var14)) { + if (var0.readySequence == var0.movementSequence && (var0.field974 > 25 || var6)) { if (var0.turnLeftSequence != -1) { var0.movementSequence = var0.turnLeftSequence; } else { @@ -390,14 +219,14 @@ public class class3 implements Enumerated { } } } else { - var0.rotation += var0.field988; - var14 = true; - if (var11 < var0.field988 || var11 > 2048 - var0.field988) { + var0.rotation += var0.field968; + var6 = true; + if (var4 < var0.field968 || var4 > 2048 - var0.field968) { var0.rotation = var0.orientation; - var14 = false; + var6 = false; } - if (var0.movementSequence == var0.readySequence && (var0.field987 > 25 || var14)) { + if (var0.readySequence == var0.movementSequence && (var0.field974 > 25 || var6)) { if (var0.turnRightSequence != -1) { var0.movementSequence = var0.turnRightSequence; } else { @@ -408,109 +237,21 @@ public class class3 implements Enumerated { var0.rotation &= 2047; } else { - var0.field987 = 0; - } - } - - var0.isWalking = false; - if (var0.movementSequence != -1) { - var2 = GrandExchangeOfferAgeComparator.SequenceDefinition_get(var0.movementSequence); - if (var2 != null && var2.frameIds != null) { - ++var0.movementFrameCycle; - if (var0.movementFrame < var2.frameIds.length && var0.movementFrameCycle > var2.frameLengths[var0.movementFrame]) { - var0.movementFrameCycle = 1; - ++var0.movementFrame; - InterfaceParent.addSequenceSoundEffect(var2, var0.movementFrame, var0.x, var0.y); - } - - if (var0.movementFrame >= var2.frameIds.length) { - var0.movementFrameCycle = 0; - var0.movementFrame = 0; - InterfaceParent.addSequenceSoundEffect(var2, var0.movementFrame, var0.x, var0.y); - } - } else { - var0.movementSequence = -1; - } - } - - if (var0.spotAnimation != -1 && Client.cycle >= var0.field975) { - if (var0.spotAnimationFrame < 0) { - var0.spotAnimationFrame = 0; + var0.field974 = 0; } - var11 = WorldMapRegion.SpotAnimationDefinition_get(var0.spotAnimation).sequence; - if (var11 != -1) { - SequenceDefinition var12 = GrandExchangeOfferAgeComparator.SequenceDefinition_get(var11); - if (var12 != null && var12.frameIds != null) { - ++var0.spotAnimationFrameCycle; - if (var0.spotAnimationFrame < var12.frameIds.length && var0.spotAnimationFrameCycle > var12.frameLengths[var0.spotAnimationFrame]) { - var0.spotAnimationFrameCycle = 1; - ++var0.spotAnimationFrame; - InterfaceParent.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; - } - } else { - var0.spotAnimation = -1; - } - } else { - var0.spotAnimation = -1; - } } - - if (var0.sequence != -1 && var0.sequenceDelay <= 1) { - var2 = GrandExchangeOfferAgeComparator.SequenceDefinition_get(var0.sequence); - if (var2.field3531 == 1 && var0.field994 > 0 && var0.field934 <= Client.cycle && var0.field982 < Client.cycle) { - var0.sequenceDelay = 1; - return; - } - } - - if (var0.sequence != -1 && var0.sequenceDelay == 0) { - var2 = GrandExchangeOfferAgeComparator.SequenceDefinition_get(var0.sequence); - if (var2 != null && var2.frameIds != null) { - ++var0.sequenceFrameCycle; - if (var0.sequenceFrame < var2.frameIds.length && var0.sequenceFrameCycle > var2.frameLengths[var0.sequenceFrame]) { - var0.sequenceFrameCycle = 1; - ++var0.sequenceFrame; - InterfaceParent.addSequenceSoundEffect(var2, var0.sequenceFrame, var0.x, var0.y); - } - - if (var0.sequenceFrame >= var2.frameIds.length) { - var0.sequenceFrame -= var2.frameCount; - ++var0.field971; - if (var0.field971 >= var2.field3516) { - var0.sequence = -1; - } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var2.frameIds.length) { - InterfaceParent.addSequenceSoundEffect(var2, var0.sequenceFrame, var0.x, var0.y); - } else { - var0.sequence = -1; - } - } - - var0.isWalking = var2.field3523; - } else { - var0.sequence = -1; - } - } - - if (var0.sequenceDelay > 0) { - --var0.sequenceDelay; - } - } - @ObfuscatedName("lu") + @ObfuscatedName("kw") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-31" + signature = "(I)V", + garbageValue = "1387375929" ) - static void method41() { - if (Client.oculusOrbState == 1) { - Client.field826 = true; - } - + @Export("Clan_leaveChat") + static final void Clan_leaveChat() { + PacketBufferNode var0 = class2.getPacketBufferNode(ClientPacket.field2259, Client.packetWriter.isaacCipher); + var0.packetBuffer.writeByte(0); + Client.packetWriter.addNode(var0); } } diff --git a/runescape-client/src/main/java/class30.java b/runescape-client/src/main/java/class30.java index e4a553e214..b8fd1ffae3 100644 --- a/runescape-client/src/main/java/class30.java +++ b/runescape-client/src/main/java/class30.java @@ -1,308 +1,187 @@ -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("ag") +@ObfuscatedName("ak") public class class30 { - @ObfuscatedName("sb") - @ObfuscatedSignature( - signature = "Lke;" - ) - @Export("masterDisk") - static ArchiveDisk masterDisk; - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lag;" - ) - static final class30 field258; @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lag;" + signature = "Lak;" ) - static final class30 field262; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = 908407325 + static final class30 field246; + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "Lak;" ) - static int field261; - @ObfuscatedName("hv") - @ObfuscatedGetter( - intValue = -378303491 - ) - @Export("cameraX") - static int cameraX; + static final class30 field251; @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 549808295 + intValue = 864715249 + ) + static int field245; + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "[Lli;" + ) + @Export("title_muteSprite") + static IndexedSprite[] title_muteSprite; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -1588163073 + ) + @Export("graphicsTickTimeIdx") + static int graphicsTickTimeIdx; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = 1815334447 ) @Export("value") final int value; static { - field258 = new class30(0); - field262 = new class30(1); + field246 = new class30(0); + field251 = new class30(1); } class30(int var1) { this.value = var1; } - @ObfuscatedName("u") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "2" + signature = "(ILkg;Lif;B)V", + garbageValue = "-8" ) - public static boolean method565() { - long var0 = TaskHandler.currentTimeMillis(); - int var2 = (int)(var0 - NetCache.field3171); - NetCache.field3171 = var0; - if (var2 > 200) { - var2 = 200; + static void method543(int var0, ArchiveDisk var1, Archive var2) { + byte[] var3 = null; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + for (ArchiveDiskAction var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var5 != null; var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { + if ((long)var0 == var5.key && var1 == var5.archiveDisk && var5.type == 0) { + var3 = var5.data; + break; + } + } } - 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; + if (var3 != null) { + var2.load(var1, var0, var3, true); } else { - try { - if (NetCache.NetCache_loadTime > 30000) { - throw new IOException(); + byte[] var4 = var1.read(var0); + var2.load(var1, var0, var4, true); + } + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "(II)Z", + garbageValue = "972731925" + ) + public static boolean method542(int var0) { + return (var0 >> 30 & 1) != 0; + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "(B)Lfc;", + garbageValue = "14" + ) + public static Clock method540() { + try { + return new NanoClock(); + } catch (Throwable var1) { + return new MilliClock(); + } + } + + @ObfuscatedName("iz") + @ObfuscatedSignature( + signature = "(Lbn;IIII)V", + garbageValue = "-1992004658" + ) + @Export("addPlayerToMenu") + static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { + if (Message.localPlayer != var0) { + if (Client.menuOptionsCount < 400) { + String var4; + int var7; + if (var0.skillLevel == 0) { + String var5 = var0.actions[0] + var0.username + var0.actions[1]; + var7 = var0.combatLevel; + int var8 = Message.localPlayer.combatLevel; + int var9 = var8 - var7; + String var6; + if (var9 < -9) { + var6 = NPC.colorStartTag(16711680); + } else if (var9 < -6) { + var6 = NPC.colorStartTag(16723968); + } else if (var9 < -3) { + var6 = NPC.colorStartTag(16740352); + } else if (var9 < 0) { + var6 = NPC.colorStartTag(16756736); + } else if (var9 > 9) { + var6 = NPC.colorStartTag(65280); + } else if (var9 > 6) { + var6 = NPC.colorStartTag(4259584); + } else if (var9 > 3) { + var6 = NPC.colorStartTag(8453888); + } else if (var9 > 0) { + var6 = NPC.colorStartTag(12648192); + } else { + var6 = NPC.colorStartTag(16776960); + } + + var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; } else { - NetFileRequest var3; - Buffer var4; - while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { - var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); - var4 = new Buffer(4); - var4.writeByte(1); - var4.writeMedium((int)var3.key); - NetCache.NetCache_socket.write(var4.array, 0, 4); - NetCache.NetCache_pendingPriorityResponses.put(var3, var3.key); - --NetCache.NetCache_pendingPriorityWritesCount; - ++NetCache.NetCache_pendingPriorityResponsesCount; - } - - while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { - var3 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); - var4 = new Buffer(4); - var4.writeByte(0); - var4.writeMedium((int)var3.key); - NetCache.NetCache_socket.write(var4.array, 0, 4); - var3.removeDual(); - NetCache.NetCache_pendingResponses.put(var3, var3.key); - --NetCache.NetCache_pendingWritesCount; - ++NetCache.NetCache_pendingResponsesCount; - } - - for (int var15 = 0; var15 < 100; ++var15) { - int var16 = NetCache.NetCache_socket.available(); - if (var16 < 0) { - throw new IOException(); - } - - if (var16 == 0) { - break; - } - - NetCache.NetCache_loadTime = 0; - byte var5 = 0; - if (NetCache.NetCache_currentResponse == null) { - var5 = 8; - } else if (NetCache.field3188 == 0) { - var5 = 1; - } - - int var6; - int var7; - int var8; - int var10; - byte[] var10000; - int var10001; - Buffer var22; - if (var5 > 0) { - var6 = var5 - NetCache.NetCache_responseHeaderBuffer.offset; - if (var6 > var16) { - var6 = var16; - } - - NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var6); - if (NetCache.field3184 != 0) { - for (var7 = 0; var7 < var6; ++var7) { - var10000 = NetCache.NetCache_responseHeaderBuffer.array; - var10001 = NetCache.NetCache_responseHeaderBuffer.offset + var7; - var10000[var10001] ^= NetCache.field3184; - } - } - - 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); - NetCache.field3181 = true; - if (var13 == null) { - var13 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var11); - NetCache.field3181 = false; - } - - if (var13 == null) { - throw new IOException(); - } - - int var14 = var9 == 0 ? 5 : 9; - NetCache.NetCache_currentResponse = var13; - class32.NetCache_responseArchiveBuffer = new Buffer(var10 + var14 + NetCache.NetCache_currentResponse.padding); - class32.NetCache_responseArchiveBuffer.writeByte(var9); - class32.NetCache_responseArchiveBuffer.writeInt(var10); - NetCache.field3188 = 8; - NetCache.NetCache_responseHeaderBuffer.offset = 0; - } else if (NetCache.field3188 == 0) { - if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { - NetCache.field3188 = 1; - NetCache.NetCache_responseHeaderBuffer.offset = 0; - } else { - NetCache.NetCache_currentResponse = null; - } - } - } else { - var6 = class32.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding; - var7 = 512 - NetCache.field3188; - if (var7 > var6 - class32.NetCache_responseArchiveBuffer.offset) { - var7 = var6 - class32.NetCache_responseArchiveBuffer.offset; - } - - if (var7 > var16) { - var7 = var16; - } - - NetCache.NetCache_socket.read(class32.NetCache_responseArchiveBuffer.array, class32.NetCache_responseArchiveBuffer.offset, var7); - if (NetCache.field3184 != 0) { - for (var8 = 0; var8 < var7; ++var8) { - var10000 = class32.NetCache_responseArchiveBuffer.array; - var10001 = class32.NetCache_responseArchiveBuffer.offset + var8; - var10000[var10001] ^= NetCache.field3184; - } - } - - var22 = class32.NetCache_responseArchiveBuffer; - var22.offset += var7; - NetCache.field3188 += var7; - if (var6 == class32.NetCache_responseArchiveBuffer.offset) { - if (16711935L == NetCache.NetCache_currentResponse.key) { - class83.NetCache_reference = class32.NetCache_responseArchiveBuffer; - - for (var8 = 0; var8 < 256; ++var8) { - Archive var17 = NetCache.NetCache_archives[var8]; - if (var17 != null) { - class83.NetCache_reference.offset = var8 * 8 + 5; - var10 = class83.NetCache_reference.readInt(); - int var18 = class83.NetCache_reference.readInt(); - var17.loadIndex(var10, var18); - } - } - } else { - NetCache.NetCache_crc.reset(); - NetCache.NetCache_crc.update(class32.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.field3184 = (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), class32.NetCache_responseArchiveBuffer.array, 16711680L == (NetCache.NetCache_currentResponse.key & 16711680L), NetCache.field3181); - } - - NetCache.NetCache_currentResponse.remove(); - if (NetCache.field3181) { - --NetCache.NetCache_pendingPriorityResponsesCount; - } else { - --NetCache.NetCache_pendingResponsesCount; - } - - NetCache.field3188 = 0; - NetCache.NetCache_currentResponse = null; - class32.NetCache_responseArchiveBuffer = null; - } else { - if (NetCache.field3188 != 512) { - break; - } - - NetCache.field3188 = 0; - } - } - } - - return true; - } - } catch (IOException var21) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var19) { + var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; } - ++NetCache.NetCache_ioExceptions; - NetCache.NetCache_socket = null; - return false; - } - } - } + int var10; + if (Client.isItemSelected == 1) { + class1.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + NPC.colorStartTag(16777215) + var4, 14, var1, var2, var3); + } else if (Client.isSpellSelected) { + if ((ReflectionCheck.selectedSpellFlags & 8) == 8) { + class1.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + NPC.colorStartTag(16777215) + var4, 15, var1, var2, var3); + } + } else { + for (var10 = 7; var10 >= 0; --var10) { + if (Client.playerMenuActions[var10] != null) { + short var11 = 0; + if (Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) { + if (Client.playerAttackOption == AttackOption.AttackOption_hidden) { + continue; + } - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(II)Lci;", - garbageValue = "-900188617" - ) - @Export("getScript") - static Script getScript(int var0) { - Script var1 = (Script)Script.Script_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = class267.archive12.takeFile(var0, 0); - if (var2 == null) { - return null; - } else { - var1 = WorldMapArea.newScript(var2); - Script.Script_cached.put(var1, (long)var0); - return var1; - } - } - } + if (Client.playerAttackOption == AttackOption.AttackOption_alwaysRightClick || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > Message.localPlayer.combatLevel) { + var11 = 2000; + } - @ObfuscatedName("gg") - @ObfuscatedSignature( - signature = "(Lbg;I)Z", - garbageValue = "-276383338" - ) - static boolean method563(Player var0) { - if (Client.drawPlayerNames == 0) { - return false; - } else if (class215.localPlayer == var0) { - boolean var1 = (Client.drawPlayerNames & 8) != 0; - return var1; - } else { - return WorldMapSection0.method257() || class1.method16() && var0.isFriend() || FriendSystem.method1920() && var0.isClanMember(); + if (Message.localPlayer.team != 0 && var0.team != 0) { + if (var0.team == Message.localPlayer.team) { + var11 = 2000; + } else { + var11 = 0; + } + } + } else if (Client.playerOptionsPriorities[var10]) { + var11 = 2000; + } + + boolean var12 = false; + var7 = Client.playerMenuOpcodes[var10] + var11; + class1.insertMenuItemNoShift(Client.playerMenuActions[var10], NPC.colorStartTag(16777215) + var4, var7, var1, var2, var3); + } + } + } + + for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) { + if (Client.menuOpcodes[var10] == 23) { + Client.menuTargets[var10] = NPC.colorStartTag(16777215) + var4; + break; + } + } + + } } } } diff --git a/runescape-client/src/main/java/class300.java b/runescape-client/src/main/java/class300.java index 6a1d6bb991..e551de539f 100644 --- a/runescape-client/src/main/java/class300.java +++ b/runescape-client/src/main/java/class300.java @@ -1,9 +1,9 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("kz") +@ObfuscatedName("kh") public class class300 { - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("writeRandomDat") public static void writeRandomDat(byte[] var0, int var1, byte[] var2, int var3, int var4) { if (var2 == var0) { @@ -51,7 +51,7 @@ public class class300 { } - @ObfuscatedName("i") + @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 index 27468147fc..3f8d76e0a6 100644 --- a/runescape-client/src/main/java/class312.java +++ b/runescape-client/src/main/java/class312.java @@ -3,94 +3,97 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lx") +@ObfuscatedName("lp") public enum class312 implements Enumerated { - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Llx;" - ) - field3814(5, 0), @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Llx;" + signature = "Llp;" ) - field3811(3, 2), - @ObfuscatedName("b") + field3813(0, 0), + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Llx;" + signature = "Llp;" ) - field3810(0, 5), - @ObfuscatedName("g") + field3809(2, 2), + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Llx;" + signature = "Llp;" ) - field3813(1, 6), - @ObfuscatedName("z") + field3815(3, 5), + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Llx;" + signature = "Llp;" ) - field3815(4, 7), + field3812(1, 6), @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Llx;" + signature = "Llp;" ) - field3816(2, 8); + field3810(4, 7), + @ObfuscatedName("b") + @ObfuscatedSignature( + signature = "Llp;" + ) + field3814(5, 8); - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -348490887 + intValue = 427096005 ) - final int field3812; - @ObfuscatedName("y") + final int field3811; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1264543599 + intValue = -1839498097 ) @Export("id") final int id; class312(int var3, int var4) { - this.field3812 = var3; + this.field3811 = var3; this.id = var4; } - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "7" + garbageValue = "-57" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("jt") + @ObfuscatedName("jd") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-847322953" + signature = "(Lha;Lii;IIZI)V", + garbageValue = "40878852" ) - static void method6006() { - for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { - int var1 = var0.group; - if (UserComparator3.loadInterface(var1)) { - boolean var2 = true; - Widget[] var3 = FloorDecoration.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 = Language.getWidget(var4); - if (var5 != null) { - ScriptEvent.invalidateWidget(var5); - } - } + @Export("addWidgetItemMenuItem") + static final void addWidgetItemMenuItem(Widget var0, ItemDefinition var1, int var2, int var3, boolean var4) { + String[] var5 = var1.inventoryActions; + byte var6 = -1; + String var7 = null; + if (var5 != null && var5[var3] != null) { + if (var3 == 0) { + var6 = 33; + } else if (var3 == 1) { + var6 = 34; + } else if (var3 == 2) { + var6 = 35; + } else if (var3 == 3) { + var6 = 36; + } else { + var6 = 37; } + + var7 = var5[var3]; + } else if (var3 == 4) { + var6 = 37; + var7 = "Drop"; + } + + if (var6 != -1 && var7 != null) { + AbstractWorldMapIcon.insertMenuItem(var7, NPC.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); } } diff --git a/runescape-client/src/main/java/class319.java b/runescape-client/src/main/java/class319.java deleted file mode 100644 index 7b1b1629a9..0000000000 --- a/runescape-client/src/main/java/class319.java +++ /dev/null @@ -1,13 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ls") -public class class319 { - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "Lln;" - ) - @Export("rightTitleSprite") - static Sprite rightTitleSprite; -} diff --git a/runescape-client/src/main/java/class32.java b/runescape-client/src/main/java/class32.java index 3a5cadb796..57ae28ca89 100644 --- a/runescape-client/src/main/java/class32.java +++ b/runescape-client/src/main/java/class32.java @@ -1,802 +1,295 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("aw") +@ObfuscatedName("ah") public class class32 { - @ObfuscatedName("r") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lkg;" + signature = "(II)Lio;", + garbageValue = "-1785885039" ) - @Export("NetCache_responseArchiveBuffer") - static Buffer NetCache_responseArchiveBuffer; + public static HealthBarDefinition method548(int var0) { + HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var0); + var1 = new HealthBarDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + HealthBarDefinition.HealthBarDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-247808033" + ) + static void method549() { + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { + if (ArchiveDiskActionHandler.field3120 == 0) { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); + } + + ArchiveDiskActionHandler.field3120 = 600; + } + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + signature = "(Ljava/lang/CharSequence;II[BII)I", + garbageValue = "505270467" + ) + @Export("encodeStringCp1252") + public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { + int var5 = var2 - var1; + + for (int var6 = 0; var6 < var5; ++var6) { + char var7 = var0.charAt(var6 + var1); + if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { + var3[var6 + var4] = (byte)var7; + } else if (var7 == 8364) { + var3[var6 + var4] = -128; + } else if (var7 == 8218) { + var3[var6 + var4] = -126; + } else if (var7 == 402) { + var3[var6 + var4] = -125; + } else if (var7 == 8222) { + var3[var6 + var4] = -124; + } else if (var7 == 8230) { + var3[var6 + var4] = -123; + } else if (var7 == 8224) { + var3[var6 + var4] = -122; + } else if (var7 == 8225) { + var3[var6 + var4] = -121; + } else if (var7 == 710) { + var3[var6 + var4] = -120; + } else if (var7 == 8240) { + var3[var6 + var4] = -119; + } else if (var7 == 352) { + var3[var6 + var4] = -118; + } else if (var7 == 8249) { + var3[var6 + var4] = -117; + } else if (var7 == 338) { + var3[var6 + var4] = -116; + } else if (var7 == 381) { + var3[var6 + var4] = -114; + } else if (var7 == 8216) { + var3[var6 + var4] = -111; + } else if (var7 == 8217) { + var3[var6 + var4] = -110; + } else if (var7 == 8220) { + var3[var6 + var4] = -109; + } else if (var7 == 8221) { + var3[var6 + var4] = -108; + } else if (var7 == 8226) { + var3[var6 + var4] = -107; + } else if (var7 == 8211) { + var3[var6 + var4] = -106; + } else if (var7 == 8212) { + var3[var6 + var4] = -105; + } else if (var7 == 732) { + var3[var6 + var4] = -104; + } else if (var7 == 8482) { + var3[var6 + var4] = -103; + } else if (var7 == 353) { + var3[var6 + var4] = -102; + } else if (var7 == 8250) { + var3[var6 + var4] = -101; + } else if (var7 == 339) { + var3[var6 + var4] = -100; + } else if (var7 == 382) { + var3[var6 + var4] = -98; + } else if (var7 == 376) { + var3[var6 + var4] = -97; + } else { + var3[var6 + var4] = 63; + } + } + + return var5; + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(IIB)I", + garbageValue = "117" + ) + static final int method551(int var0, int var1) { + int var2 = WorldMapRegion.method536(var0 - 1, var1 - 1) + WorldMapRegion.method536(1 + var0, var1 - 1) + WorldMapRegion.method536(var0 - 1, var1 + 1) + WorldMapRegion.method536(var0 + 1, var1 + 1); + int var3 = WorldMapRegion.method536(var0 - 1, var1) + WorldMapRegion.method536(var0 + 1, var1) + WorldMapRegion.method536(var0, var1 - 1) + WorldMapRegion.method536(var0, 1 + var1); + int var4 = WorldMapRegion.method536(var0, var1); + return var2 / 16 + var3 / 8 + var4 / 4; + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "(III)I", + garbageValue = "-577138619" + ) + static final int method555(int var0, int var1) { + if (var0 == -1) { + return 12345678; + } else { + var1 = (var0 & 127) * var1 / 128; + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; + } + + return (var0 & 65408) + var1; + } + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + signature = "(ILcu;ZB)I", + garbageValue = "-35" + ) + static int method559(int var0, Script var1, boolean var2) { + Widget var3 = Tile.getWidget(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); + if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = class14.method157(WorldMapSection0.getWidgetClickMask(var3)); + return 1; + } else if (var0 != ScriptOpcodes.IF_GETOP) { + if (var0 == ScriptOpcodes.IF_GETOPBASE) { + if (var3.dataText == null) { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3.dataText; + } + + return 1; + } else { + return 2; + } + } else { + int var4 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + --var4; + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3.actions[var4]; + } else { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } + } + + @ObfuscatedName("aw") + @ObfuscatedSignature( + signature = "(ZI)V", + garbageValue = "118209259" + ) + public static void method557(boolean var0) { + if (var0 != ItemDefinition.ItemDefinition_inMembersWorld) { + class54.method1104(); + ItemDefinition.ItemDefinition_inMembersWorld = var0; + } + + } @ObfuscatedName("hf") @ObfuscatedSignature( - signature = "(IIIILjava/lang/String;Ljava/lang/String;IIB)V", - garbageValue = "64" + signature = "(I)V", + garbageValue = "1594017150" ) - @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; + static final void method556() { + for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { + if (var0.hitpoints == -1) { + var0.delay = 0; + SequenceDefinition.method4821(var0); + } else { + var0.remove(); + } } - PacketBufferNode var8; - if (var2 == 1) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = ModelData0.getPacketBufferNode(ClientPacket.field2244, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(class51.baseX * 64 + var0); - var8.packetBuffer.method5628(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShortLE(class43.selectedItemSlot); - var8.packetBuffer.method5636(HealthBarUpdate.selectedItemId); - var8.packetBuffer.method5648(class1.selectedItemWidget); - var8.packetBuffer.writeShortLE(var3); - var8.packetBuffer.writeShort(VarcInt.baseY * 64 + var1); - 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 = ModelData0.getPacketBufferNode(ClientPacket.field2263, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5636(Client.selectedSpellChildIndex); - var8.packetBuffer.method5613(var3); - var8.packetBuffer.method5613(VarcInt.baseY * 64 + var1); - var8.packetBuffer.writeInt(WorldMapAreaData.selectedSpellWidget); - var8.packetBuffer.method5628(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShortLE(class51.baseX * 64 + var0); - Client.packetWriter.addNode(var8); - } else if (var2 == 3) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = ModelData0.getPacketBufferNode(ClientPacket.field2226, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortLE(VarcInt.baseY * 64 + var1); - var8.packetBuffer.writeShortLE(class51.baseX * 64 + var0); - var8.packetBuffer.method5598(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShortLE(var3); - 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 = ModelData0.getPacketBufferNode(ClientPacket.field2297, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5628(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5636(VarcInt.baseY * 64 + var1); - var8.packetBuffer.method5636(var3); - var8.packetBuffer.writeShort(class51.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 = ModelData0.getPacketBufferNode(ClientPacket.field2237, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5613(VarcInt.baseY * 64 + var1); - var8.packetBuffer.method5613(var3); - var8.packetBuffer.method5636(class51.baseX * 64 + var0); - var8.packetBuffer.method5598(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 = ModelData0.getPacketBufferNode(ClientPacket.field2252, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShortLE(VarcInt.baseY * 64 + var1); - var8.packetBuffer.method5636(var3); - var8.packetBuffer.method5613(class51.baseX * 64 + var0); - 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 = ModelData0.getPacketBufferNode(ClientPacket.field2316, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeInt(class1.selectedItemWidget); - var9.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method5636(HealthBarUpdate.selectedItemId); - var9.packetBuffer.method5613(var3); - var9.packetBuffer.method5613(class43.selectedItemSlot); - 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 = ModelData0.getPacketBufferNode(ClientPacket.field2300, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeInt(WorldMapAreaData.selectedSpellWidget); - var9.packetBuffer.method5636(Client.selectedSpellChildIndex); - var9.packetBuffer.method5598(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method5613(var3); - 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 = ModelData0.getPacketBufferNode(ClientPacket.field2255, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5636(var3); - var9.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 10) { - var13 = Client.npcs[var3]; - if (var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = ModelData0.getPacketBufferNode(ClientPacket.field2245, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShortLE(var3); - var9.packetBuffer.method5598(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 = ModelData0.getPacketBufferNode(ClientPacket.field2308, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5613(var3); - var9.packetBuffer.method5628(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 = ModelData0.getPacketBufferNode(ClientPacket.field2243, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5628(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeShortLE(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 13) { - var13 = Client.npcs[var3]; - if (var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = ModelData0.getPacketBufferNode(ClientPacket.field2257, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5598(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method5613(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 = ModelData0.getPacketBufferNode(ClientPacket.field2286, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5636(HealthBarUpdate.selectedItemId); - var9.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeInt(class1.selectedItemWidget); - var9.packetBuffer.writeShortLE(var3); - var9.packetBuffer.method5613(class43.selectedItemSlot); - Client.packetWriter.addNode(var9); + } + + @ObfuscatedName("in") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;Lha;B)Ljava/lang/String;", + garbageValue = "-110" + ) + static String method553(String var0, Widget var1) { + if (var0.indexOf("%") != -1) { + for (int var2 = 1; var2 <= 5; ++var2) { + while (true) { + int var3 = var0.indexOf("%" + var2); + if (var3 == -1) { + break; } - } 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 = ModelData0.getPacketBufferNode(ClientPacket.field2225, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5613(var3); - var9.packetBuffer.method5811(WorldMapAreaData.selectedSpellWidget); - var9.packetBuffer.method5628(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method5613(Client.selectedSpellChildIndex); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 16) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = ModelData0.getPacketBufferNode(ClientPacket.field2284, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5613(class43.selectedItemSlot); - var8.packetBuffer.writeShortLE(class51.baseX * 64 + var0); - var8.packetBuffer.method5811(class1.selectedItemWidget); - var8.packetBuffer.writeShort(VarcInt.baseY * 64 + var1); - var8.packetBuffer.method5628(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShortLE(HealthBarUpdate.selectedItemId); - var8.packetBuffer.method5613(var3); - Client.packetWriter.addNode(var8); - } else if (var2 == 17) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = ModelData0.getPacketBufferNode(ClientPacket.field2254, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5613(class51.baseX * 64 + var0); - var8.packetBuffer.method5598(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShort(VarcInt.baseY * 64 + var1); - var8.packetBuffer.writeShortLE(var3); - var8.packetBuffer.method5648(WorldMapAreaData.selectedSpellWidget); - var8.packetBuffer.method5636(Client.selectedSpellChildIndex); - Client.packetWriter.addNode(var8); - } else if (var2 == 18) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = ModelData0.getPacketBufferNode(ClientPacket.field2236, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5598(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5636(var3); - var8.packetBuffer.writeShort(VarcInt.baseY * 64 + var1); - var8.packetBuffer.method5636(class51.baseX * 64 + var0); - Client.packetWriter.addNode(var8); - } else if (var2 == 19) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = ModelData0.getPacketBufferNode(ClientPacket.field2227, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortLE(class51.baseX * 64 + var0); - var8.packetBuffer.method5598(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5636(var3); - var8.packetBuffer.writeShort(VarcInt.baseY * 64 + var1); - Client.packetWriter.addNode(var8); - } else if (var2 == 20) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = ModelData0.getPacketBufferNode(ClientPacket.field2233, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5613(var3); - var8.packetBuffer.method5613(VarcInt.baseY * 64 + var1); - var8.packetBuffer.writeShortLE(class51.baseX * 64 + var0); - 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 = ModelData0.getPacketBufferNode(ClientPacket.field2264, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5613(VarcInt.baseY * 64 + var1); - var8.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.method5613(class51.baseX * 64 + var0); - Client.packetWriter.addNode(var8); - } else if (var2 == 22) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = ModelData0.getPacketBufferNode(ClientPacket.field2220, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortLE(VarcInt.baseY * 64 + var1); - var8.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5613(var3); - var8.packetBuffer.writeShort(class51.baseX * 64 + var0); - Client.packetWriter.addNode(var8); - } else if (var2 == 23) { - if (Client.isMenuOpen) { - class2.scene.setViewportWalking(); + + String var4 = var0.substring(0, var3); + int var6 = User.method5076(var1, var2 - 1); + String var5; + if (var6 < 999999999) { + var5 = Integer.toString(var6); } else { - class2.scene.menuOpen(ClientPacket.Client_plane, var0, var1, true); + var5 = "*"; } - } else { - PacketBufferNode var10; - Widget var16; - if (var2 == 24) { - var16 = Language.getWidget(var1); - boolean var11 = true; - if (var16.contentType > 0) { - var11 = WorldMapID.method567(var16); - } - if (var11) { - var10 = ModelData0.getPacketBufferNode(ClientPacket.field2274, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var10); - } - } else { - if (var2 == 25) { - var16 = UserComparator3.getWidgetChild(var1, var0); - if (var16 != null) { - Actor.Widget_runOnTargetLeave(); - TextureProvider.selectSpell(var1, var0, Client.method1655(MenuAction.getWidgetClickMask(var16)), var16.itemId); - Client.isItemSelected = 0; - Client.selectedSpellActionName = LoginPacket.method3662(var16); - if (Client.selectedSpellActionName == null) { - Client.selectedSpellActionName = "null"; - } - - if (var16.isIf3) { - Client.selectedSpellName = var16.dataText + class222.colorStartTag(16777215); - } else { - Client.selectedSpellName = class222.colorStartTag(65280) + var16.spellName + class222.colorStartTag(16777215); - } - } - - return; - } - - if (var2 == 26) { - Actor.method1756(); - } else { - int var12; - Widget var14; - if (var2 == 28) { - var8 = ModelData0.getPacketBufferNode(ClientPacket.field2274, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var8); - var14 = Language.getWidget(var1); - if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { - var12 = var14.cs1Instructions[0][1]; - Varps.Varps_main[var12] = 1 - Varps.Varps_main[var12]; - ObjectDefinition.changeGameOptions(var12); - } - } else if (var2 == 29) { - var8 = ModelData0.getPacketBufferNode(ClientPacket.field2274, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var8); - var14 = Language.getWidget(var1); - if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { - var12 = var14.cs1Instructions[0][1]; - if (Varps.Varps_main[var12] != var14.cs1ComparisonValues[0]) { - Varps.Varps_main[var12] = var14.cs1ComparisonValues[0]; - ObjectDefinition.changeGameOptions(var12); - } - } - } else if (var2 == 30) { - if (Client.meslayerContinueWidget == null) { - WorldMapCacheName.resumePauseWidget(var1, var0); - Client.meslayerContinueWidget = UserComparator3.getWidgetChild(var1, var0); - ScriptEvent.invalidateWidget(Client.meslayerContinueWidget); - } - } else if (var2 == 31) { - var8 = ModelData0.getPacketBufferNode(ClientPacket.field2248, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortLE(var3); - var8.packetBuffer.writeShortLE(class43.selectedItemSlot); - var8.packetBuffer.method5811(var1); - var8.packetBuffer.writeInt(class1.selectedItemWidget); - var8.packetBuffer.method5613(HealthBarUpdate.selectedItemId); - var8.packetBuffer.method5613(var0); - Client.packetWriter.addNode(var8); - Client.field664 = 0; - class51.field432 = Language.getWidget(var1); - Client.field749 = var0; - } else if (var2 == 32) { - var8 = ModelData0.getPacketBufferNode(ClientPacket.field2269, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.writeInt(WorldMapAreaData.selectedSpellWidget); - var8.packetBuffer.method5613(var0); - var8.packetBuffer.method5613(var3); - var8.packetBuffer.writeShort(Client.selectedSpellChildIndex); - Client.packetWriter.addNode(var8); - Client.field664 = 0; - class51.field432 = Language.getWidget(var1); - Client.field749 = var0; - } else if (var2 == 33) { - var8 = ModelData0.getPacketBufferNode(ClientPacket.field2279, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5636(var3); - var8.packetBuffer.method5613(var0); - var8.packetBuffer.method5647(var1); - Client.packetWriter.addNode(var8); - Client.field664 = 0; - class51.field432 = Language.getWidget(var1); - Client.field749 = var0; - } else if (var2 == 34) { - var8 = ModelData0.getPacketBufferNode(ClientPacket.field2294, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(var0); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.method5648(var1); - Client.packetWriter.addNode(var8); - Client.field664 = 0; - class51.field432 = Language.getWidget(var1); - Client.field749 = var0; - } else if (var2 == 35) { - var8 = ModelData0.getPacketBufferNode(ClientPacket.field2222, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(var0); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.method5647(var1); - Client.packetWriter.addNode(var8); - Client.field664 = 0; - class51.field432 = Language.getWidget(var1); - Client.field749 = var0; - } else if (var2 == 36) { - var8 = ModelData0.getPacketBufferNode(ClientPacket.field2235, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5811(var1); - var8.packetBuffer.writeShortLE(var0); - var8.packetBuffer.writeShortLE(var3); - Client.packetWriter.addNode(var8); - Client.field664 = 0; - class51.field432 = Language.getWidget(var1); - Client.field749 = var0; - } else if (var2 == 37) { - var8 = ModelData0.getPacketBufferNode(ClientPacket.field2250, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5613(var3); - var8.packetBuffer.method5648(var1); - var8.packetBuffer.method5613(var0); - Client.packetWriter.addNode(var8); - Client.field664 = 0; - class51.field432 = Language.getWidget(var1); - Client.field749 = var0; - } else { - if (var2 == 38) { - Actor.Widget_runOnTargetLeave(); - var16 = Language.getWidget(var1); - Client.isItemSelected = 1; - class43.selectedItemSlot = var0; - class1.selectedItemWidget = var1; - HealthBarUpdate.selectedItemId = var3; - ScriptEvent.invalidateWidget(var16); - Client.selectedItemName = class222.colorStartTag(16748608) + Interpreter.ItemDefinition_get(var3).name + class222.colorStartTag(16777215); - if (Client.selectedItemName == null) { - Client.selectedItemName = "null"; - } - - return; - } - - if (var2 == 39) { - var8 = ModelData0.getPacketBufferNode(ClientPacket.field2303, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortLE(var0); - var8.packetBuffer.method5613(var3); - var8.packetBuffer.method5811(var1); - Client.packetWriter.addNode(var8); - Client.field664 = 0; - class51.field432 = Language.getWidget(var1); - Client.field749 = var0; - } else if (var2 == 40) { - var8 = ModelData0.getPacketBufferNode(ClientPacket.field2310, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5613(var3); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.writeShortLE(var0); - Client.packetWriter.addNode(var8); - Client.field664 = 0; - class51.field432 = Language.getWidget(var1); - Client.field749 = var0; - } else if (var2 == 41) { - var8 = ModelData0.getPacketBufferNode(ClientPacket.field2315, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortLE(var3); - var8.packetBuffer.writeShort(var0); - var8.packetBuffer.method5647(var1); - Client.packetWriter.addNode(var8); - Client.field664 = 0; - class51.field432 = Language.getWidget(var1); - Client.field749 = var0; - } else if (var2 == 42) { - var8 = ModelData0.getPacketBufferNode(ClientPacket.field2253, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5811(var1); - var8.packetBuffer.method5636(var0); - var8.packetBuffer.method5613(var3); - Client.packetWriter.addNode(var8); - Client.field664 = 0; - class51.field432 = Language.getWidget(var1); - Client.field749 = var0; - } else if (var2 == 43) { - var8 = ModelData0.getPacketBufferNode(ClientPacket.field2317, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5613(var3); - var8.packetBuffer.writeShortLE(var0); - var8.packetBuffer.method5811(var1); - Client.packetWriter.addNode(var8); - Client.field664 = 0; - class51.field432 = Language.getWidget(var1); - Client.field749 = 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 = ModelData0.getPacketBufferNode(ClientPacket.field2231, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5598(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method5613(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 45) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = ModelData0.getPacketBufferNode(ClientPacket.field2238, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5598(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeShortLE(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 = ModelData0.getPacketBufferNode(ClientPacket.field2261, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 47) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = ModelData0.getPacketBufferNode(ClientPacket.field2267, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5613(var3); - var9.packetBuffer.writeByte(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 = ModelData0.getPacketBufferNode(ClientPacket.field2265, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShortLE(var3); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 49) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = ModelData0.getPacketBufferNode(ClientPacket.field2241, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5628(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method5636(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 50) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = ModelData0.getPacketBufferNode(ClientPacket.field2251, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(var3); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 51) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = ModelData0.getPacketBufferNode(ClientPacket.field2242, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var9); - } - } else { - label894: { - if (var2 != 57) { - if (var2 == 58) { - var16 = UserComparator3.getWidgetChild(var1, var0); - if (var16 != null) { - var9 = ModelData0.getPacketBufferNode(ClientPacket.field2232, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShortLE(Client.selectedSpellChildIndex); - var9.packetBuffer.writeShort(Client.field799); - var9.packetBuffer.method5636(var16.itemId); - var9.packetBuffer.method5647(WorldMapAreaData.selectedSpellWidget); - var9.packetBuffer.method5636(var0); - var9.packetBuffer.method5811(var1); - Client.packetWriter.addNode(var9); - } - break label894; - } - - if (var2 == 1001) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = ModelData0.getPacketBufferNode(ClientPacket.field2292, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5598(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5613(VarcInt.baseY * 64 + var1); - var8.packetBuffer.method5636(class51.baseX * 64 + var0); - var8.packetBuffer.method5613(var3); - Client.packetWriter.addNode(var8); - break label894; - } - - if (var2 == 1002) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - var8 = ModelData0.getPacketBufferNode(ClientPacket.field2304, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var8); - break label894; - } - - 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 = ModelData0.getPacketBufferNode(ClientPacket.field2288, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeShort(var17.id); - Client.packetWriter.addNode(var10); - } - } - break label894; - } - - if (var2 == 1004) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - var8 = ModelData0.getPacketBufferNode(ClientPacket.field2293, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5636(var3); - Client.packetWriter.addNode(var8); - break label894; - } - - if (var2 == 1005) { - var16 = Language.getWidget(var1); - if (var16 != null && var16.itemQuantities[var0] >= 100000) { - GrandExchangeOfferAgeComparator.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + Interpreter.ItemDefinition_get(var3).name); - } else { - var9 = ModelData0.getPacketBufferNode(ClientPacket.field2293, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5636(var3); - Client.packetWriter.addNode(var9); - } - - Client.field664 = 0; - class51.field432 = Language.getWidget(var1); - Client.field749 = var0; - break label894; - } - - if (var2 != 1007) { - if (var2 == 1010 || var2 == 1009 || var2 == 1008 || var2 == 1011 || var2 == 1012) { - WorldMapRegion.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); - } - break label894; - } - } - - var16 = UserComparator3.getWidgetChild(var1, var0); - if (var16 != null) { - WorldMapData_1.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); - } - } - } - } - } - } + var0 = var4 + var5 + var0.substring(var3 + 2); } } } - if (Client.isItemSelected != 0) { - Client.isItemSelected = 0; - ScriptEvent.invalidateWidget(Language.getWidget(class1.selectedItemWidget)); - } - - if (Client.isSpellSelected) { - Actor.Widget_runOnTargetLeave(); - } - - if (class51.field432 != null && Client.field664 == 0) { - ScriptEvent.invalidateWidget(class51.field432); - } - + return var0; } - @ObfuscatedName("kb") + @ObfuscatedName("jn") @ObfuscatedSignature( - signature = "(Lkg;II)V", - garbageValue = "-847322953" + signature = "(Lha;IIZB)V", + garbageValue = "-35" ) - static void method570(Buffer var0, int var1) { - class226.method4200(var0.array, var1); - GrandExchangeEvent.method86(var0, var1); + @Export("alignWidgetSize") + static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { + int var4 = var0.width; + int var5 = var0.height; + if (var0.widthAlignment == 0) { + var0.width = var0.rawWidth; + } else if (var0.widthAlignment == 1) { + var0.width = var1 - var0.rawWidth; + } else if (var0.widthAlignment == 2) { + var0.width = var0.rawWidth * var1 >> 14; + } + + if (var0.heightAlignment == 0) { + var0.height = var0.rawHeight; + } else if (var0.heightAlignment == 1) { + var0.height = var2 - var0.rawHeight; + } else if (var0.heightAlignment == 2) { + var0.height = var2 * var0.rawHeight >> 14; + } + + if (var0.widthAlignment == 4) { + var0.width = var0.field2617 * var0.height / var0.field2569; + } + + if (var0.heightAlignment == 4) { + var0.height = var0.field2569 * var0.width / var0.field2617; + } + + if (var0.contentType == 1337) { + Client.viewportWidget = var0; + } + + if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { + ScriptEvent var6 = new ScriptEvent(); + var6.widget = var0; + var6.args = var0.onResize; + Client.scriptEvents.addFirst(var6); + } + } } diff --git a/runescape-client/src/main/java/class325.java b/runescape-client/src/main/java/class325.java index 8548d83b77..e770e8a112 100644 --- a/runescape-client/src/main/java/class325.java +++ b/runescape-client/src/main/java/class325.java @@ -2,24 +2,33 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("lt") +@ObfuscatedName("lz") public class class325 { - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -383751597 - ) - @Export("SpriteBuffer_spriteCount") - static int SpriteBuffer_spriteCount; @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1738507571 + intValue = -1370932437 + ) + @Export("SpriteBuffer_spriteCount") + public static int SpriteBuffer_spriteCount; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 14463585 ) @Export("SpriteBuffer_spriteWidth") - static int SpriteBuffer_spriteWidth; - @ObfuscatedName("p") - @Export("SpriteBuffer_spriteWidths") - static int[] SpriteBuffer_spriteWidths; + public static int SpriteBuffer_spriteWidth; @ObfuscatedName("y") - @Export("SpriteBuffer_spritePalette") - static int[] SpriteBuffer_spritePalette; + @ObfuscatedGetter( + intValue = 1456048807 + ) + @Export("SpriteBuffer_spriteHeight") + public static int SpriteBuffer_spriteHeight; + @ObfuscatedName("w") + @Export("SpriteBuffer_xOffsets") + public static int[] SpriteBuffer_xOffsets; + @ObfuscatedName("p") + @Export("SpriteBuffer_yOffsets") + public static int[] SpriteBuffer_yOffsets; + @ObfuscatedName("e") + @Export("SpriteBuffer_spriteHeights") + public static int[] SpriteBuffer_spriteHeights; } diff --git a/runescape-client/src/main/java/class335.java b/runescape-client/src/main/java/class335.java deleted file mode 100644 index 971a716b44..0000000000 --- a/runescape-client/src/main/java/class335.java +++ /dev/null @@ -1,19 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("lc") -public abstract class class335 { - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 1866733167 - ) - static int field4014; - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "Lky;" - ) - @Export("ItemDefinition_fontPlain11") - static Font ItemDefinition_fontPlain11; -} diff --git a/runescape-client/src/main/java/class336.java b/runescape-client/src/main/java/class336.java index 7a96afd23b..249c4e97ab 100644 --- a/runescape-client/src/main/java/class336.java +++ b/runescape-client/src/main/java/class336.java @@ -1,10 +1,10 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("lv") +@ObfuscatedName("lt") public class class336 { - @ObfuscatedName("i") + @ObfuscatedName("d") static final int[] field4020; - @ObfuscatedName("k") + @ObfuscatedName("c") static final int[] field4021; static { @@ -13,8 +13,8 @@ public class class336 { double var0 = 0.0030679615757712823D; for (int var2 = 0; var2 < 2048; ++var2) { - field4020[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2)); - field4021[var2] = (int)(65536.0D * Math.cos(var0 * (double)var2)); + field4020[var2] = (int)(65536.0D * Math.sin((double)var2 * var0)); + field4021[var2] = (int)(65536.0D * Math.cos((double)var2 * var0)); } } diff --git a/runescape-client/src/main/java/class338.java b/runescape-client/src/main/java/class338.java index c632e97d95..4de6cd6f06 100644 --- a/runescape-client/src/main/java/class338.java +++ b/runescape-client/src/main/java/class338.java @@ -1,14 +1,14 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("mf") +@ObfuscatedName("mj") public class class338 { - @ObfuscatedName("b") - static final char[] field4034; - @ObfuscatedName("g") - static final char[] field4037; + @ObfuscatedName("y") + public static final char[] field4037; + @ObfuscatedName("w") + public static final char[] field4035; static { - field4034 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; - field4037 = new char[]{'[', ']', '#'}; + field4037 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; + field4035 = new char[]{'[', ']', '#'}; } } diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java index 2f21920555..7ee0b5a0dd 100644 --- a/runescape-client/src/main/java/class4.java +++ b/runescape-client/src/main/java/class4.java @@ -1,203 +1,110 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("z") +@ObfuscatedName("p") final class class4 implements class0 { - @ObfuscatedName("nw") - @ObfuscatedSignature( - signature = "[Lhl;" - ) - static Widget[] field22; - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(Ljava/lang/Object;Lkg;I)V", - garbageValue = "-1331780546" - ) - public void vmethod57(Object var1, Buffer var2) { - this.method55((String)var1, var2); - } - @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Lkg;I)Ljava/lang/Object;", - garbageValue = "1713449680" + signature = "(Ljava/lang/Object;Lkq;I)V", + garbageValue = "-685052934" ) - public Object vmethod65(Buffer var1) { - return var1.readStringCp1252NullTerminated(); - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;Lkg;B)V", - garbageValue = "-1" - ) - void method55(String var1, Buffer var2) { - var2.writeStringCp1252NullTerminated(var1); - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "910919278" - ) - public static void method56(int var0) { - MouseHandler.MouseHandler_idleCycles = var0; + public void vmethod53(Object var1, Buffer var2) { + this.method51((String)var1, var2); } @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lhl;IIII)V", - garbageValue = "1884834950" + signature = "(Lkq;I)Ljava/lang/Object;", + garbageValue = "390816352" ) - @Export("Widget_setKeyRate") - static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { - if (var0.field2654 == null) { - throw new RuntimeException(); - } else { - var0.field2654[var1] = var2; - var0.field2655[var1] = var3; - } + public Object vmethod60(Buffer var1) { + return var1.readStringCp1252NullTerminated(); } - @ObfuscatedName("ak") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(ILci;ZI)I", - garbageValue = "-578960278" + signature = "(Ljava/lang/String;Lkq;I)V", + garbageValue = "1310089464" ) - static int method66(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.OC_NAME) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = Interpreter.ItemDefinition_get(var3).name; - return 1; + void method51(String var1, Buffer var2) { + var2.writeStringCp1252NullTerminated(var1); + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "(ILhz;IIIZI)V", + garbageValue = "-1294056256" + ) + public static void method59(int var0, AbstractArchive var1, int var2, int var3, int var4, boolean var5) { + class197.field2392 = 1; + Coord.musicTrackArchive = var1; + class16.musicTrackGroupId = var2; + GrandExchangeOffer.musicTrackFileId = var3; + class197.musicTrackVolume = var4; + WorldMapDecoration.musicTrackBoolean = var5; + ParamDefinition.field3275 = var0; + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "(IB)Leq;", + garbageValue = "103" + ) + @Export("getFrames") + static Frames getFrames(int var0) { + Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); + if (var1 != null) { + return var1; } else { - int var4; - ItemDefinition var5; - if (var0 == ScriptOpcodes.OC_OP) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - var5 = Interpreter.ItemDefinition_get(var3); - if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; - } else { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; - } + AbstractArchive var3 = SequenceDefinition.SequenceDefinition_animationsArchive; + AbstractArchive var4 = SequenceDefinition.SequenceDefinition_skeletonsArchive; + boolean var5 = true; + int[] var6 = var3.getGroupFileIds(var0); - return 1; - } else if (var0 == ScriptOpcodes.OC_IOP) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - var5 = Interpreter.ItemDefinition_get(var3); - if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; + for (int var7 = 0; var7 < var6.length; ++var7) { + byte[] var8 = var3.getFile(var0, var6[var7]); + if (var8 == null) { + var5 = false; } else { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = ""; + int var9 = (var8[0] & 255) << 8 | var8[1] & 255; + byte[] var10 = var4.getFile(var9, 0); + if (var10 == null) { + var5 = false; + } } + } - return 1; - } else if (var0 == ScriptOpcodes.OC_COST) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Interpreter.ItemDefinition_get(var3).price; - return 1; - } else if (var0 == ScriptOpcodes.OC_STACKABLE) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Interpreter.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; - return 1; + Frames var2; + if (!var5) { + var2 = null; } else { - ItemDefinition var6; - if (var0 == ScriptOpcodes.OC_CERT) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var6 = Interpreter.ItemDefinition_get(var3); - if (var6.noteTemplate == -1 && var6.note >= 0) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var6.note; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_UNCERT) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var6 = Interpreter.ItemDefinition_get(var3); - if (var6.noteTemplate >= 0 && var6.note >= 0) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var6.note; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_MEMBERS) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Interpreter.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var6 = Interpreter.ItemDefinition_get(var3); - if (var6.placeholderTemplate == -1 && var6.placeholder >= 0) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var6.placeholder; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var6 = Interpreter.ItemDefinition_get(var3); - if (var6.placeholderTemplate >= 0 && var6.placeholder >= 0) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var6.placeholder; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_FIND) { - String var7 = Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - Message.findItemDefinitions(var7, var4 == 1); - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = UserComparator10.foundItemIdCount; - return 1; - } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { - if (var0 == ScriptOpcodes.OC_FINDRESET) { - GrandExchangeOfferAgeComparator.foundItemIndex = 0; - return 1; - } else { - return 2; - } - } else { - if (MusicPatch.foundItemIds != null && GrandExchangeOfferAgeComparator.foundItemIndex < UserComparator10.foundItemIdCount) { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = MusicPatch.foundItemIds[++GrandExchangeOfferAgeComparator.foundItemIndex - 1] & '\uffff'; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1; - } - - return 1; + try { + var2 = new Frames(var3, var4, var0, false); + } catch (Exception var12) { + var2 = null; } } + + if (var2 != null) { + SequenceDefinition.SequenceDefinition_cachedFrames.put(var2, (long)var0); + } + + return var2; } } - @ObfuscatedName("ed") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "1158604899" + signature = "(Lhz;IB)Z", + garbageValue = "-83" ) - static boolean method63() { - if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { - while (Client.archiveLoadersDone < Client.archiveLoaders.size()) { - ArchiveLoader var0 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); - if (!var0.isLoaded()) { - return false; - } - - ++Client.archiveLoadersDone; - } - - return true; + static boolean method61(AbstractArchive var0, int var1) { + byte[] var2 = var0.takeFileFlat(var1); + if (var2 == null) { + return false; } else { + AbstractWorldMapIcon.SpriteBuffer_decode(var2); return true; } } diff --git a/runescape-client/src/main/java/class40.java b/runescape-client/src/main/java/class40.java index a9bf06735e..8de6d8e86f 100644 --- a/runescape-client/src/main/java/class40.java +++ b/runescape-client/src/main/java/class40.java @@ -3,42 +3,26 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("az") +@ObfuscatedName("ac") public class class40 { - @ObfuscatedName("ax") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -483133983 + intValue = 890126163 ) - static int field348; - @ObfuscatedName("bx") + static int field336; + @ObfuscatedName("gm") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lls;" ) - static ServerBuild field352; - @ObfuscatedName("bf") - @ObfuscatedSignature( - signature = "[Llm;" - ) - @Export("worldSelectArrows") - static IndexedSprite[] worldSelectArrows; - @ObfuscatedName("gk") + @Export("redHintArrowSprite") + static Sprite redHintArrowSprite; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -704226791 - ) - static int field343; - @ObfuscatedName("gq") - @ObfuscatedSignature( - signature = "Lln;" - ) - @Export("compass") - static Sprite compass; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -1530993967 + intValue = -1677674321 ) @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("tileTemplates") byte[][][] tileTemplates; @@ -46,25 +30,25 @@ public class class40 { this.pixelsPerTile = var1; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "(IIIIIIIII)V", - garbageValue = "-1919092898" + garbageValue = "-876031007" ) - void method740(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + void method736(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { if (var7 != 0 && this.pixelsPerTile != 0 && this.tileTemplates != null) { - var8 = this.method741(var8, var7); - var7 = this.method750(var7); + var8 = this.method727(var8, var7); + var7 = this.method728(var7); Rasterizer2D.Rasterizer2D_drawGradientPixels(var1, var2, var5, var6, var3, var4, this.tileTemplates[var7 - 1][var8], this.pixelsPerTile); } } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(III)I", - garbageValue = "1952990188" + garbageValue = "-2145199421" ) - int method741(int var1, int var2) { + int method727(int var1, int var2) { if (var2 == 9) { var1 = var1 + 1 & 3; } @@ -80,12 +64,12 @@ public class class40 { return var1; } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "(II)I", - garbageValue = "-1172069919" + garbageValue = "327680" ) - int method750(int var1) { + int method728(int var1) { if (var1 != 9 && var1 != 10) { return var1 == 11 ? 8 : var1; } else { @@ -93,10 +77,10 @@ public class class40 { } } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "965464972" + garbageValue = "-1496491774" ) @Export("init") void init() { @@ -113,10 +97,10 @@ public class class40 { } } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "0" + signature = "(I)V", + garbageValue = "2131351823" ) @Export("init0") void init0() { @@ -180,10 +164,10 @@ public class class40 { this.tileTemplates[0][3] = var1; } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1030474557" + garbageValue = "-706960701" ) @Export("init1") void init1() { @@ -251,10 +235,10 @@ public class class40 { this.tileTemplates[1][3] = var1; } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "13206" + signature = "(B)V", + garbageValue = "-98" ) @Export("init2") void init2() { @@ -318,10 +302,10 @@ public class class40 { this.tileTemplates[2][3] = var1; } - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-2137728663" + garbageValue = "-1429091802" ) @Export("init3") void init3() { @@ -385,10 +369,10 @@ public class class40 { this.tileTemplates[3][3] = var1; } - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "665774048" + garbageValue = "-1595701030" ) @Export("init4") void init4() { @@ -452,10 +436,10 @@ public class class40 { this.tileTemplates[4][3] = var1; } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-77636423" + signature = "(S)V", + garbageValue = "-12923" ) @Export("init5") void init5() { @@ -521,10 +505,10 @@ public class class40 { this.tileTemplates[5][3] = var1; } - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "57571088" + garbageValue = "1129170979" ) @Export("init6") void init6() { @@ -590,10 +574,10 @@ public class class40 { this.tileTemplates[6][3] = var1; } - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "124" + signature = "(I)V", + garbageValue = "-1818794515" ) @Export("init7") void init7() { @@ -659,792 +643,12 @@ public class class40 { this.tileTemplates[7][3] = var1; } - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(IB)Lia;", - garbageValue = "63" - ) - public static VarcInt method778(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.method4485(new Buffer(var2)); - } - - VarcInt.VarcInt_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(ILke;Lij;I)V", - garbageValue = "-1464178541" - ) - static void method780(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); - } - - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { - if (ArchiveDiskActionHandler.field3155 == 0) { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); - } - - ArchiveDiskActionHandler.field3155 = 600; - } - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-62" - ) - @Export("savePreferences") - static void savePreferences() { - AccessFile var0 = null; - - try { - var0 = class191.getPreferencesFile("", UserComparator8.field1973.name, true); - Buffer var1 = UserComparator10.clientPreferences.toBuffer(); - var0.write(var1.array, 0, var1.offset); - } catch (Exception var3) { - } - - try { - if (var0 != null) { - var0.closeSync(true); - } - } catch (Exception var2) { - } - - } - - @ObfuscatedName("w") + @ObfuscatedName("ac") @ObfuscatedSignature( signature = "(IB)I", - garbageValue = "75" + garbageValue = "98" ) - @Export("Messages_getNextChatID") - static int Messages_getNextChatID(int var0) { - Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); - if (var1 == null) { - return -1; - } else { - return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; - } - } - - @ObfuscatedName("fc") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-644551053" - ) - @Export("logOut") - static final void logOut() { - Client.packetWriter.close(); - GrandExchangeOfferNameComparator.method154(); - BoundaryObject.method3311(); - DynamicObject.method2259(); - GraphicsObject.method2039(); - class222.method4195(); - WorldMapAreaData.method703(); - SequenceDefinition.SequenceDefinition_cached.clear(); - SequenceDefinition.SequenceDefinition_cachedFrames.clear(); - SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); - SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); - VarbitDefinition.VarbitDefinition_cached.clear(); - class195.method3746(); - HitSplatDefinition.HitSplatDefinition_cached.clear(); - HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); - HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); - class237.method4421(); - ViewportMouse.method3012(); - class3.method35(); - Occluder.method3336(); - MusicPatchPcmStream.method3970(); - HealthBar.method2054(); - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); - Script.Script_cached.clear(); - GrandExchangeOfferAgeComparator.archive0.clearFiles(); - class43.archive1.clearFiles(); - WorldMapID.archive3.clearFiles(); - SpriteMask.archive4.clearFiles(); - DirectByteArrayCopier.archive5.clearFiles(); - AbstractWorldMapData.archive6.clearFiles(); - ClientPacket.archive7.clearFiles(); - WorldMapRegion.archive8.clearFiles(); - class2.archive9.clearFiles(); - class81.archive10.clearFiles(); - ScriptFrame.archive11.clearFiles(); - class267.archive12.clearFiles(); - class2.scene.clear(); - - for (int var0 = 0; var0 < 4; ++var0) { - Client.collisionMaps[var0].clear(); - } - - System.gc(); - UrlRequest.method3358(2); - Client.currentTrackGroupId = -1; - Client.field742 = false; - - for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var1.stream1 != null) { - ClientPacket.pcmStreamMixer.removeSubStream(var1.stream1); - var1.stream1 = null; - } - - if (var1.stream2 != null) { - ClientPacket.pcmStreamMixer.removeSubStream(var1.stream2); - var1.stream2 = null; - } - } - - ObjectSound.objectSounds.clear(); - class81.updateGameState(10); - } - - @ObfuscatedName("io") - @ObfuscatedSignature( - signature = "([Lhl;IIIIIIIII)V", - garbageValue = "-1496434270" - ) - @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 || !AbstractByteArrayCopier.isComponentHidden(var10)) { - if (var10.contentType > 0) { - UserList.method5233(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) { - class4.field22 = var0; - WorldMapSection2.field200 = var6; - TilePaint.field1782 = var7; - continue; - } - - if (Client.isDraggingWidget && Client.field820) { - var15 = MouseHandler.MouseHandler_x; - var16 = MouseHandler.MouseHandler_y; - var15 -= Client.widgetClickX; - var16 -= Client.widgetClickY; - if (var15 < Client.field698) { - var15 = Client.field698; - } - - if (var15 + var10.width > Client.field698 + Client.clickedWidgetParent.width) { - var15 = Client.field698 + Client.clickedWidgetParent.width - var10.width; - } - - if (var16 < Client.field822) { - var16 = Client.field822; - } - - if (var16 + var10.height > Client.field822 + Client.clickedWidgetParent.height) { - var16 = Client.field822 + Client.clickedWidgetParent.height - var10.height; - } - - var12 = var15; - var13 = var16; - } - - if (!var10.isScrollBar) { - var14 = 128; - } - } - - int var17; - int var18; - int var20; - int var21; - int var22; - int var30; - if (var10.type == 2) { - var15 = var2; - var16 = var3; - var17 = var4; - var18 = var5; - } else if (var10.type == 9) { - var30 = var12; - var20 = var13; - var21 = var12 + var10.width; - var22 = var13 + var10.height; - if (var21 < var12) { - var30 = var21; - var21 = var12; - } - - if (var22 < var13) { - var20 = var22; - var22 = var13; - } - - ++var21; - ++var22; - var15 = var30 > var2 ? var30 : var2; - var16 = var20 > var3 ? var20 : var3; - var17 = var21 < var4 ? var21 : var4; - var18 = var22 < var5 ? var22 : var5; - } else { - var30 = var12 + var10.width; - var20 = var13 + var10.height; - var15 = var12 > var2 ? var12 : var2; - var16 = var13 > var3 ? var13 : var3; - var17 = var30 < var4 ? var30 : var4; - var18 = var20 < var5 ? var20 : var5; - } - - if (!var10.isIf3 || var15 < var17 && var16 < var18) { - if (var10.contentType != 0) { - if (var10.contentType == 1336) { - if (Client.displayFps) { - var13 += 15; - Player.fontPlain12.drawRightAligned("Fps:" + GameShell.fps, var12 + var10.width, var13, 16776960, -1); - var13 += 15; - Runtime var38 = Runtime.getRuntime(); - var20 = (int)((var38.totalMemory() - var38.freeMemory()) / 1024L); - var21 = 16776960; - if (var20 > 327680 && !Client.isLowDetail) { - var21 = 16711680; - } - - Player.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); - var13 += 15; - } - continue; - } - - if (var10.contentType == 1337) { - Client.viewportX = var12; - Client.viewportY = var13; - class43.drawEntities(var12, var13, var10.width, var10.height); - Client.field847[var10.rootIndex] = true; - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1338) { - MusicPatchNode2.drawMinimap(var10, var12, var13, var11); - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1339) { - TileItem.drawCompass(var10, var12, var13, var11); - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1400) { - WorldMapRegion.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); - } - - if (var10.contentType == 1401) { - WorldMapRegion.worldMap.drawOverview(var12, var13, var10.width, var10.height); - } - - if (var10.contentType == 1402) { - DynamicObject.loginScreenRunesAnimation.draw(var12, Client.cycle); - } - } - - if (var10.type == 0) { - if (!var10.isIf3 && AbstractByteArrayCopier.isComponentHidden(var10) && var10 != class185.mousedOverWidgetIf1) { - continue; - } - - if (!var10.isIf3) { - if (var10.scrollY > var10.scrollHeight - var10.height) { - var10.scrollY = var10.scrollHeight - var10.height; - } - - if (var10.scrollY < 0) { - var10.scrollY = 0; - } - } - - drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); - if (var10.children != null) { - drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); - } - - InterfaceParent var19 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); - if (var19 != null) { - class65.drawWidgets(var19.group, var15, var16, var17, var18, var12, var13, var11); - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - } - - if (Client.isResizable || Client.field849[var11] || Client.gameDrawingMode > 1) { - if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { - JagexCache.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); - } - - if (var10.type != 1) { - int var23; - int var24; - int var25; - int var26; - if (var10.type == 2) { - var30 = 0; - - for (var20 = 0; var20 < var10.rawHeight; ++var20) { - for (var21 = 0; var21 < var10.rawWidth; ++var21) { - var22 = var21 * (var10.paddingX + 32) + var12; - var23 = var13 + var20 * (var10.paddingY + 32); - if (var30 < 20) { - var22 += var10.inventoryXOffsets[var30]; - var23 += var10.inventoryYOffsets[var30]; - } - - if (var10.itemIds[var30] <= 0) { - if (var10.inventorySprites != null && var30 < 20) { - Sprite var42 = var10.getInventorySprite(var30); - if (var42 != null) { - var42.drawTransBgAt(var22, var23); - } else if (Widget.field2647) { - ScriptEvent.invalidateWidget(var10); - } - } - } else { - boolean var39 = false; - boolean var40 = false; - var26 = var10.itemIds[var30] - 1; - if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == DevicePcmPlayerProvider.dragInventoryWidget && var30 == Client.dragItemSlotSource) { - Sprite var35; - if (Client.isItemSelected == 1 && var30 == class43.selectedItemSlot && var10.id == class1.selectedItemWidget) { - var35 = VertexNormal.getItemSprite(var26, var10.itemQuantities[var30], 2, 0, 2, false); - } else { - var35 = VertexNormal.getItemSprite(var26, var10.itemQuantities[var30], 1, 3153952, 2, false); - } - - if (var35 != null) { - if (var10 == DevicePcmPlayerProvider.dragInventoryWidget && var30 == Client.dragItemSlotSource) { - var24 = MouseHandler.MouseHandler_x - Client.field751; - var25 = MouseHandler.MouseHandler_y - Client.field752; - if (var24 < 5 && var24 > -5) { - var24 = 0; - } - - if (var25 < 5 && var25 > -5) { - var25 = 0; - } - - if (Client.itemDragDuration < 5) { - var24 = 0; - var25 = 0; - } - - var35.drawTransAt(var22 + var24, var23 + var25, 128); - if (var1 != -1) { - Widget var28 = var0[var1 & 65535]; - int var29; - if (var25 + var23 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { - var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field704 / 3; - if (var29 > Client.field704 * 10) { - var29 = Client.field704 * 10; - } - - if (var29 > var28.scrollY) { - var29 = var28.scrollY; - } - - var28.scrollY -= var29; - Client.field752 += var29; - ScriptEvent.invalidateWidget(var28); - } - - if (var25 + var23 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { - var29 = (var23 + var25 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field704 / 3; - if (var29 > Client.field704 * 10) { - var29 = Client.field704 * 10; - } - - if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { - var29 = var28.scrollHeight - var28.height - var28.scrollY; - } - - var28.scrollY += var29; - Client.field752 -= var29; - ScriptEvent.invalidateWidget(var28); - } - } - } else if (var10 == class51.field432 && var30 == Client.field749) { - var35.drawTransAt(var22, var23, 128); - } else { - var35.drawTransBgAt(var22, var23); - } - } else { - ScriptEvent.invalidateWidget(var10); - } - } - } - - ++var30; - } - } - } else if (var10.type == 3) { - if (WorldMapArea.runCs1(var10)) { - var30 = var10.color2; - if (var10 == class185.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { - var30 = var10.mouseOverColor2; - } - } else { - var30 = var10.color; - if (var10 == class185.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { - var30 = var10.mouseOverColor; - } - } - - if (var10.fill) { - switch(var10.fillMode.value) { - case 1: - Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); - break; - case 2: - Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); - break; - default: - if (var14 == 0) { - Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var30); - } else { - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var30, 256 - (var14 & 255)); - } - } - } else if (var14 == 0) { - Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var30); - } else { - Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var30, 256 - (var14 & 255)); - } - } else { - Font var36; - if (var10.type == 4) { - var36 = var10.getFont(); - if (var36 == null) { - if (Widget.field2647) { - ScriptEvent.invalidateWidget(var10); - } - } else { - String var45 = var10.text; - if (WorldMapArea.runCs1(var10)) { - var20 = var10.color2; - if (var10 == class185.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { - var20 = var10.mouseOverColor2; - } - - if (var10.text2.length() > 0) { - var45 = var10.text2; - } - } else { - var20 = var10.color; - if (var10 == class185.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { - var20 = var10.mouseOverColor; - } - } - - if (var10.isIf3 && var10.itemId != -1) { - ItemDefinition var46 = Interpreter.ItemDefinition_get(var10.itemId); - var45 = var46.name; - if (var45 == null) { - var45 = "null"; - } - - if ((var46.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { - var45 = class222.colorStartTag(16748608) + var45 + "" + " " + 'x' + WorldMapElement.formatItemStacks(var10.itemQuantity); - } - } - - if (var10 == Client.meslayerContinueWidget) { - var45 = "Please wait..."; - var20 = var10.color; - } - - if (!var10.isIf3) { - var45 = GraphicsObject.method2036(var45, var10); - } - - var36.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 var37; - if (!var10.isIf3) { - var37 = var10.getSprite(WorldMapArea.runCs1(var10)); - if (var37 != null) { - var37.drawTransBgAt(var12, var13); - } else if (Widget.field2647) { - ScriptEvent.invalidateWidget(var10); - } - } else { - if (var10.itemId != -1) { - var37 = VertexNormal.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); - } else { - var37 = var10.getSprite(false); - } - - if (var37 == null) { - if (Widget.field2647) { - ScriptEvent.invalidateWidget(var10); - } - } else { - var20 = var37.width; - var21 = var37.height; - if (!var10.spriteTiling) { - var22 = var10.width * 4096 / var20; - if (var10.spriteAngle != 0) { - var37.method6226(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); - } else if (var14 != 0) { - var37.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); - } else if (var20 == var10.width && var21 == var10.height) { - var37.drawTransBgAt(var12, var13); - } else { - var37.drawScaledAt(var12, var13, var10.width, var10.height); - } - } else { - Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); - var22 = (var20 - 1 + var10.width) / var20; - var23 = (var21 - 1 + var10.height) / var21; - - for (var24 = 0; var24 < var22; ++var24) { - for (var25 = 0; var25 < var23; ++var25) { - if (var10.spriteAngle != 0) { - var37.method6226(var20 / 2 + var12 + var20 * var24, var21 / 2 + var13 + var25 * var21, var10.spriteAngle, 4096); - } else if (var14 != 0) { - var37.drawTransAt(var12 + var24 * var20, var13 + var21 * var25, 256 - (var14 & 255)); - } else { - var37.drawTransBgAt(var12 + var24 * var20, var13 + var25 * var21); - } - } - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - } - } - } - } else { - ItemDefinition var34; - if (var10.type == 6) { - boolean var43 = WorldMapArea.runCs1(var10); - if (var43) { - var20 = var10.sequenceId2; - } else { - var20 = var10.sequenceId; - } - - Model var41 = null; - var22 = 0; - if (var10.itemId != -1) { - var34 = Interpreter.ItemDefinition_get(var10.itemId); - if (var34 != null) { - var34 = var34.getCountObj(var10.itemQuantity); - var41 = var34.getModel(1); - if (var41 != null) { - var41.calculateBoundsCylinder(); - var22 = var41.height / 2; - } else { - ScriptEvent.invalidateWidget(var10); - } - } - } else if (var10.modelType == 5) { - if (var10.modelId == 0) { - var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); - } else { - var41 = class215.localPlayer.getModel(); - } - } else if (var20 == -1) { - var41 = var10.getModel((SequenceDefinition)null, -1, var43, class215.localPlayer.appearance); - if (var41 == null && Widget.field2647) { - ScriptEvent.invalidateWidget(var10); - } - } else { - SequenceDefinition var47 = GrandExchangeOfferAgeComparator.SequenceDefinition_get(var20); - var41 = var10.getModel(var47, var10.modelFrame, var43, class215.localPlayer.appearance); - if (var41 == null && Widget.field2647) { - ScriptEvent.invalidateWidget(var10); - } - } - - Rasterizer3D.method3024(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.method2958(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); - } else { - var41.calculateBoundsCylinder(); - if (var10.modelOrthog) { - var41.method2918(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); - } else { - var41.method2958(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY); - } - } - } - - Rasterizer3D.Rasterizer3D_method3(); - } else { - if (var10.type == 7) { - var36 = var10.getFont(); - if (var36 == null) { - if (Widget.field2647) { - ScriptEvent.invalidateWidget(var10); - } - continue; - } - - var20 = 0; - - for (var21 = 0; var21 < var10.rawHeight; ++var21) { - for (var22 = 0; var22 < var10.rawWidth; ++var22) { - if (var10.itemIds[var20] > 0) { - var34 = Interpreter.ItemDefinition_get(var10.itemIds[var20] - 1); - String var31; - if (var34.isStackable != 1 && var10.itemQuantities[var20] == 1) { - var31 = class222.colorStartTag(16748608) + var34.name + ""; - } else { - var31 = class222.colorStartTag(16748608) + var34.name + "" + " " + 'x' + WorldMapElement.formatItemStacks(var10.itemQuantities[var20]); - } - - var25 = var12 + var22 * (var10.paddingX + 115); - var26 = (var10.paddingY + 12) * var21 + var13; - if (var10.textXAlignment == 0) { - var36.draw(var31, var25, var26, var10.color, var10.textShadowed ? 0 : -1); - } else if (var10.textXAlignment == 1) { - var36.drawCentered(var31, var10.width / 2 + var25, var26, var10.color, var10.textShadowed ? 0 : -1); - } else { - var36.drawRightAligned(var31, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1); - } - } - - ++var20; - } - } - } - - if (var10.type == 8 && var10 == GrandExchangeOfferWorldComparator.field31 && Client.field768 == Client.field643) { - var30 = 0; - var20 = 0; - Font var32 = Player.fontPlain12; - String var33 = var10.text; - - String var44; - for (var33 = GraphicsObject.method2036(var33, var10); var33.length() > 0; var20 = var20 + var32.ascent + 1) { - var24 = var33.indexOf("
"); - if (var24 != -1) { - var44 = var33.substring(0, var24); - var33 = var33.substring(var24 + 4); - } else { - var44 = var33; - var33 = ""; - } - - var25 = var32.stringWidth(var44); - if (var25 > var30) { - var30 = var25; - } - } - - var30 += 6; - var20 += 7; - var24 = var12 + var10.width - 5 - var30; - var25 = var13 + var10.height + 5; - if (var24 < var12 + 5) { - var24 = var12 + 5; - } - - if (var30 + var24 > var4) { - var24 = var4 - var30; - } - - if (var25 + var20 > var5) { - var25 = var5 - var20; - } - - Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var30, var20, 16777120); - Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var30, var20, 0); - var33 = var10.text; - var26 = var25 + var32.ascent + 2; - - for (var33 = GraphicsObject.method2036(var33, var10); var33.length() > 0; var26 = var26 + var32.ascent + 1) { - int var27 = var33.indexOf("
"); - if (var27 != -1) { - var44 = var33.substring(0, var27); - var33 = var33.substring(var27 + 4); - } else { - var44 = var33; - var33 = ""; - } - - var32.draw(var44, var24 + 3, var26, 0, -1); - } - } - - if (var10.type == 9) { - if (var10.field2709) { - var30 = var12; - var20 = var13 + var10.height; - var21 = var12 + var10.width; - var22 = var13; - } else { - var30 = var12; - var20 = var13; - var21 = var12 + var10.width; - var22 = var13 + var10.height; - } - - if (var10.lineWid == 1) { - Rasterizer2D.Rasterizer2D_drawLine(var30, var20, var21, var22, var10.color); - } else { - WorldMapSection0.method255(var30, var20, var21, var22, var10.color, var10.lineWid); - } - } - } - } - } - } - } - } - } - } - } - + static int method762(int var0) { + return (int)Math.pow(2.0D, (double)((float)var0 / 256.0F + 7.0F)); } } diff --git a/runescape-client/src/main/java/class42.java b/runescape-client/src/main/java/class42.java index ca7bad5e6d..2eac94a5dd 100644 --- a/runescape-client/src/main/java/class42.java +++ b/runescape-client/src/main/java/class42.java @@ -5,263 +5,445 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ae") public class class42 implements WorldMapSection { - @ObfuscatedName("bm") + @ObfuscatedName("sy") @ObfuscatedSignature( - signature = "[Lln;" + signature = "Llx;" ) - @Export("worldSelectBackSprites") - static Sprite[] worldSelectBackSprites; - @ObfuscatedName("br") - @ObfuscatedSignature( - signature = "Llm;" - ) - static IndexedSprite field364; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -1474152669 - ) - int field370; + @Export("platformInfo") + static PlatformInfo platformInfo; @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1928734715 + intValue = 876812837 ) - int field361; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 1228215067 - ) - int field371; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -1297027701 - ) - int field363; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -114767203 - ) - int field362; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = 318560359 - ) - int field365; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -1391575641 - ) - int field366; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = -1608149363 - ) - int field367; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -2127073261 - ) - int field368; + int field355; @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -395386295 + intValue = -533343471 ) - int field369; + int field350; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = -1956244031 + ) + int field349; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = -1105762903 + ) + int field358; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -199863857 + ) + int field351; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -1075817101 + ) + int field352; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -1187703403 + ) + int field348; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -1352980527 + ) + int field354; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = -197811131 + ) + int field347; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 305542163 + ) + int field356; class42() { } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Laf;I)V", - garbageValue = "-567179164" + signature = "(Laa;I)V", + garbageValue = "515570621" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field362) { - var1.regionLowX = this.field362; + if (var1.regionLowX > this.field351) { + var1.regionLowX = this.field351; } - if (var1.regionHighX < this.field362) { - var1.regionHighX = this.field362; + if (var1.regionHighX < this.field351) { + var1.regionHighX = this.field351; } - if (var1.regionLowY > this.field365) { - var1.regionLowY = this.field365; + if (var1.regionLowY > this.field352) { + var1.regionLowY = this.field352; } - if (var1.regionHighY < this.field365) { - var1.regionHighY = this.field365; + if (var1.regionHighY < this.field352) { + var1.regionHighY = this.field352; } } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IIIB)Z", - garbageValue = "0" + signature = "(IIII)Z", + garbageValue = "2033433479" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.field370 && var1 < this.field361 + this.field370) { - return var2 >= (this.field371 << 6) + (this.field366 << 3) && var2 <= (this.field371 << 6) + (this.field366 << 3) + 7 && var3 >= (this.field363 << 6) + (this.field367 << 3) && var3 <= (this.field363 << 6) + (this.field367 << 3) + 7; + if (var1 >= this.field355 && var1 < this.field355 + this.field350) { + return var2 >= (this.field349 << 6) + (this.field348 << 3) && var2 <= (this.field349 << 6) + (this.field348 << 3) + 7 && var3 >= (this.field358 << 6) + (this.field354 << 3) && var3 <= (this.field358 << 6) + (this.field354 << 3) + 7; } else { return false; } } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(III)Z", - garbageValue = "110675609" + signature = "(IIB)Z", + garbageValue = "-66" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >= (this.field362 << 6) + (this.field368 << 3) && var1 <= (this.field362 << 6) + (this.field368 << 3) + 7 && var2 >= (this.field365 << 6) + (this.field369 << 3) && var2 <= (this.field365 << 6) + (this.field369 << 3) + 7; + return var1 >= (this.field351 << 6) + (this.field347 << 3) && var1 <= (this.field351 << 6) + (this.field347 << 3) + 7 && var2 >= (this.field352 << 6) + (this.field356 << 3) && var2 <= (this.field352 << 6) + (this.field356 << 3) + 7; } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(IIIB)[I", - garbageValue = "69" + signature = "(IIII)[I", + garbageValue = "1684413985" ) @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.field362 * 64 - this.field371 * 64 + var2 + (this.field368 * 8 - this.field366 * 8), var3 + (this.field365 * 64 - this.field363 * 64) + (this.field369 * 8 - this.field367 * 8)}; + int[] var4 = new int[]{this.field351 * 64 - this.field349 * 64 + var2 + (this.field347 * 8 - this.field348 * 8), var3 + (this.field352 * 64 - this.field358 * 64) + (this.field356 * 8 - this.field354 * 8)}; return var4; } } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(III)Lhx;", - garbageValue = "1062204141" + signature = "(IIB)Lht;", + garbageValue = "21" ) @Export("coord") public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { return null; } else { - int var3 = this.field371 * 64 - this.field362 * 64 + (this.field366 * 8 - this.field368 * 8) + var1; - int var4 = this.field363 * 64 - this.field365 * 64 + var2 + (this.field367 * 8 - this.field369 * 8); - return new Coord(this.field370, var3, var4); + int var3 = this.field349 * 64 - this.field351 * 64 + (this.field348 * 8 - this.field347 * 8) + var1; + int var4 = this.field358 * 64 - this.field352 * 64 + var2 + (this.field354 * 8 - this.field356 * 8); + return new Coord(this.field355, var3, var4); } } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(Lkg;I)V", - garbageValue = "-179898655" + signature = "(Lkq;B)V", + garbageValue = "74" ) @Export("read") public void read(Buffer var1) { - this.field370 = var1.readUnsignedByte(); - this.field361 = var1.readUnsignedByte(); - this.field371 = var1.readUnsignedShort(); - this.field366 = var1.readUnsignedByte(); - this.field363 = var1.readUnsignedShort(); - this.field367 = var1.readUnsignedByte(); - this.field362 = var1.readUnsignedShort(); - this.field368 = var1.readUnsignedByte(); - this.field365 = var1.readUnsignedShort(); - this.field369 = var1.readUnsignedByte(); - this.method795(); + this.field355 = var1.readUnsignedByte(); + this.field350 = var1.readUnsignedByte(); + this.field349 = var1.readUnsignedShort(); + this.field348 = var1.readUnsignedByte(); + this.field358 = var1.readUnsignedShort(); + this.field354 = var1.readUnsignedByte(); + this.field351 = var1.readUnsignedShort(); + this.field347 = var1.readUnsignedByte(); + this.field352 = var1.readUnsignedShort(); + this.field356 = var1.readUnsignedByte(); + this.method771(); } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1221961977" + garbageValue = "794869852" ) - void method795() { + void method771() { } - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(II)Lix;", - garbageValue = "-2061319703" - ) - public static HitSplatDefinition method811(int var0) { - HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); - var1 = new HitSplatDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(IB)Liz;", - garbageValue = "-13" - ) - public static HealthBarDefinition method810(int var0) { - HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var0); - var1 = new HealthBarDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - HealthBarDefinition.HealthBarDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "(IZIZB)V", - garbageValue = "71" - ) - @Export("sortWorldList") - static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { - if (Skills.World_worlds != null) { - WorldMapData_1.doWorldSorting(0, Skills.World_worlds.length - 1, var0, var1, var2, var3); - } - - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;B)I", - garbageValue = "-5" - ) - @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 + Skills.charToByteCp1252(var0.charAt(var3)); + @ObfuscatedName("i") + public static boolean method790(long var0) { + boolean var2 = var0 != 0L; + if (var2) { + boolean var3 = (int)(var0 >>> 16 & 1L) == 1; + var2 = !var3; } return var2; } - @ObfuscatedName("y") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "2010130113" + signature = "(I)Z", + garbageValue = "1817896162" ) - static void method809() { - Players.Players_count = 0; + public static boolean method792() { + return class197.field2392 != 0 ? true : GZipDecompressor.midiPcmStream.isReady(); + } - for (int var0 = 0; var0 < 2048; ++var0) { - Players.field1248[var0] = null; - Players.field1247[var0] = 1; + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "(Lko;Lko;S)V", + garbageValue = "-12122" + ) + static void method781(Font var0, Font var1) { + if (Calendar.worldSelectBackSprites == null) { + Calendar.worldSelectBackSprites = class80.method2058(class3.archive8, "sl_back", ""); } + if (AbstractWorldMapIcon.worldSelectFlagSprites == null) { + AbstractWorldMapIcon.worldSelectFlagSprites = class195.method3667(class3.archive8, "sl_flags", ""); + } + + if (Message.worldSelectArrows == null) { + Message.worldSelectArrows = class195.method3667(class3.archive8, "sl_arrows", ""); + } + + if (SpotAnimationDefinition.worldSelectStars == null) { + SpotAnimationDefinition.worldSelectStars = class195.method3667(class3.archive8, "sl_stars", ""); + } + + if (GrandExchangeEvent.worldSelectLeftSprite == null) { + GrandExchangeEvent.worldSelectLeftSprite = Canvas.SpriteBuffer_getIndexedSpriteByName(class3.archive8, "leftarrow", ""); + } + + if (UserList.worldSelectRightSprite == null) { + UserList.worldSelectRightSprite = Canvas.SpriteBuffer_getIndexedSpriteByName(class3.archive8, "rightarrow", ""); + } + + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); + var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); + if (SpotAnimationDefinition.worldSelectStars != null) { + SpotAnimationDefinition.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); + var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); + SpotAnimationDefinition.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); + var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); + } + + int var4; + int var5; + if (Message.worldSelectArrows != null) { + int var2 = Login.xPadding + 280; + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { + Message.worldSelectArrows[2].drawAt(var2, 4); + } else { + Message.worldSelectArrows[0].drawAt(var2, 4); + } + + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { + Message.worldSelectArrows[3].drawAt(var2 + 15, 4); + } else { + Message.worldSelectArrows[1].drawAt(var2 + 15, 4); + } + + var0.draw("World", var2 + 32, 17, 16777215, -1); + int var3 = Login.xPadding + 390; + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { + Message.worldSelectArrows[2].drawAt(var3, 4); + } else { + Message.worldSelectArrows[0].drawAt(var3, 4); + } + + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { + Message.worldSelectArrows[3].drawAt(var3 + 15, 4); + } else { + Message.worldSelectArrows[1].drawAt(var3 + 15, 4); + } + + var0.draw("Players", var3 + 32, 17, 16777215, -1); + var4 = Login.xPadding + 500; + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { + Message.worldSelectArrows[2].drawAt(var4, 4); + } else { + Message.worldSelectArrows[0].drawAt(var4, 4); + } + + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { + Message.worldSelectArrows[3].drawAt(var4 + 15, 4); + } else { + Message.worldSelectArrows[1].drawAt(var4 + 15, 4); + } + + var0.draw("Location", var4 + 32, 17, 16777215, -1); + var5 = Login.xPadding + 610; + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { + Message.worldSelectArrows[2].drawAt(var5, 4); + } else { + Message.worldSelectArrows[0].drawAt(var5, 4); + } + + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { + Message.worldSelectArrows[3].drawAt(var5 + 15, 4); + } else { + Message.worldSelectArrows[1].drawAt(var5 + 15, 4); + } + + var0.draw("Type", var5 + 32, 17, 16777215, -1); + } + + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); + var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); + Login.hoveredWorldIndex = -1; + if (Calendar.worldSelectBackSprites != null) { + byte var23 = 88; + byte var24 = 19; + var4 = 765 / (var23 + 1) - 1; + var5 = 480 / (var24 + 1); + + int var6; + int var7; + do { + var6 = var5; + var7 = var4; + if (var5 * (var4 - 1) >= World.World_count) { + --var4; + } + + if (var4 * (var5 - 1) >= World.World_count) { + --var5; + } + + if (var4 * (var5 - 1) >= World.World_count) { + --var5; + } + } while(var6 != var5 || var7 != var4); + + var6 = (765 - var23 * var4) / (var4 + 1); + if (var6 > 5) { + var6 = 5; + } + + var7 = (480 - var24 * var5) / (var5 + 1); + if (var7 > 5) { + var7 = 5; + } + + int var8 = (765 - var4 * var23 - var6 * (var4 - 1)) / 2; + int var9 = (480 - var24 * var5 - var7 * (var5 - 1)) / 2; + int var10 = (var5 + World.World_count - 1) / var5; + Login.worldSelectPagesCount = var10 - var4; + if (GrandExchangeEvent.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { + GrandExchangeEvent.worldSelectLeftSprite.drawAt(8, AttackOption.canvasHeight / 2 - GrandExchangeEvent.worldSelectLeftSprite.subHeight / 2); + } + + if (UserList.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { + UserList.worldSelectRightSprite.drawAt(GrandExchangeOfferTotalQuantityComparator.canvasWidth - UserList.worldSelectRightSprite.subWidth - 8, AttackOption.canvasHeight / 2 - UserList.worldSelectRightSprite.subHeight / 2); + } + + int var11 = var9 + 23; + int var12 = var8 + Login.xPadding; + int var13 = 0; + boolean var14 = false; + int var15 = Login.worldSelectPage; + + int var16; + for (var16 = var5 * var15; var16 < World.World_count && var15 - Login.worldSelectPage < var4; ++var16) { + World var22 = class162.World_worlds[var16]; + boolean var18 = true; + String var19 = Integer.toString(var22.population); + if (var22.population == -1) { + var19 = "OFF"; + var18 = false; + } else if (var22.population > 1980) { + var19 = "FULL"; + var18 = false; + } + + int var21 = 0; + byte var20; + if (var22.isBeta()) { + if (var22.isMembersOnly()) { + var20 = 7; + } else { + var20 = 6; + } + } else if (var22.isDeadman()) { + var21 = 16711680; + if (var22.isMembersOnly()) { + var20 = 5; + } else { + var20 = 4; + } + } else if (var22.method1775()) { + if (var22.isMembersOnly()) { + var20 = 9; + } else { + var20 = 8; + } + } else if (var22.isPvp()) { + if (var22.isMembersOnly()) { + var20 = 3; + } else { + var20 = 2; + } + } else if (var22.isMembersOnly()) { + var20 = 1; + } else { + var20 = 0; + } + + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var11 && MouseHandler.MouseHandler_x < var12 + var23 && MouseHandler.MouseHandler_y < var24 + var11 && var18) { + Login.hoveredWorldIndex = var16; + Calendar.worldSelectBackSprites[var20].drawTransOverlayAt(var12, var11, 128, 16777215); + var14 = true; + } else { + Calendar.worldSelectBackSprites[var20].drawAt(var12, var11); + } + + if (AbstractWorldMapIcon.worldSelectFlagSprites != null) { + AbstractWorldMapIcon.worldSelectFlagSprites[(var22.isMembersOnly() ? 8 : 0) + var22.location].drawAt(var12 + 29, var11); + } + + var0.drawCentered(Integer.toString(var22.id), var12 + 15, var24 / 2 + var11 + 5, var21, -1); + var1.drawCentered(var19, var12 + 60, var24 / 2 + var11 + 5, 268435455, -1); + var11 = var11 + var24 + var7; + ++var13; + if (var13 >= var5) { + var11 = var9 + 23; + var12 = var12 + var6 + var23; + var13 = 0; + ++var15; + } + } + + if (var14) { + var16 = var1.stringWidth(class162.World_worlds[Login.hoveredWorldIndex].activity) + 6; + int var17 = var1.ascent + 8; + int var25 = MouseHandler.MouseHandler_y + 25; + if (var25 + var17 > 480) { + var25 = MouseHandler.MouseHandler_y - 25 - var17; + } + + Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var16 / 2, var25, var16, var17, 16777120); + Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var16 / 2, var25, var16, var17, 0); + var1.drawCentered(class162.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var25 + var1.ascent + 4, 0, -1); + } + } + + IgnoreList.rasterProvider.drawFull(0, 0); + } + + @ObfuscatedName("ju") + @ObfuscatedSignature( + signature = "(I)Z", + garbageValue = "283959833" + ) + @Export("getTapToDrop") + static boolean getTapToDrop() { + return Client.tapToDrop; } } diff --git a/runescape-client/src/main/java/class43.java b/runescape-client/src/main/java/class43.java deleted file mode 100644 index 20d3f69da2..0000000000 --- a/runescape-client/src/main/java/class43.java +++ /dev/null @@ -1,322 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import netscape.javascript.JSObject; - -@ObfuscatedName("aj") -public final class class43 { - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 1757015417 - ) - @Export("Interpreter_stringStackSize") - static int Interpreter_stringStackSize; - @ObfuscatedName("ds") - @ObfuscatedSignature( - signature = "Lij;" - ) - @Export("archive1") - static Archive archive1; - @ObfuscatedName("la") - @ObfuscatedGetter( - intValue = 714486745 - ) - @Export("selectedItemSlot") - static int selectedItemSlot; - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(Lln;IIIB)V", - garbageValue = "86" - ) - static void method822(Sprite var0, int var1, int var2, int var3) { - DemotingHashTable var4 = WorldMapRegion.WorldMapRegion_cachedSprites; - long var6 = (long)(var3 << 16 | var1 << 8 | var2); - var4.put(var0, var6, var0.pixels.length * 4); - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "96" - ) - public static boolean method820() { - ReflectionCheck var0 = (ReflectionCheck)class96.reflectionChecks.last(); - return var0 != null; - } - - @ObfuscatedName("gj") - @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-58" - ) - @Export("getWindowedMode") - static int getWindowedMode() { - return Client.isResizable ? 2 : 1; - } - - @ObfuscatedName("gh") - @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "-2123734164" - ) - @Export("drawEntities") - static final void drawEntities(int var0, int var1, int var2, int var3) { - ++Client.viewportDrawCount; - if (class215.localPlayer.x >> 7 == Client.destinationX && class215.localPlayer.y >> 7 == Client.destinationY) { - Client.destinationX = 0; - } - - Tiles.method1161(); - FontName.method5427(); - WorldMapData_0.addNpcsToScene(true); - Tiles.method1160(); - WorldMapData_0.addNpcsToScene(false); - WorldMapSection0.method251(); - - for (GraphicsObject var4 = (GraphicsObject)Client.graphicsObjects.last(); var4 != null; var4 = (GraphicsObject)Client.graphicsObjects.previous()) { - if (var4.plane == ClientPacket.Client_plane && !var4.isFinished) { - if (Client.cycle >= var4.cycleStart) { - var4.advance(Client.field704); - if (var4.isFinished) { - var4.remove(); - } else { - class2.scene.drawEntity(var4.plane, var4.x, var4.y, var4.height, 60, var4, 0, -1L, false); - } - } - } else { - var4.remove(); - } - } - - FileSystem.setViewportShape(var0, var1, var2, var3, true); - var0 = Client.viewportOffsetX; - var1 = Client.viewportOffsetY; - var2 = Client.viewportWidth; - var3 = Client.viewportHeight; - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - int var5; - int var6; - int var7; - int var8; - int var9; - int var10; - int var11; - int var12; - int var18; - if (!Client.isCameraLocked) { - var18 = Client.camAngleX; - if (Client.field728 / 256 > var18) { - var18 = Client.field728 / 256; - } - - if (Client.field835[4] && Client.field901[4] + 128 > var18) { - var18 = Client.field901[4] + 128; - } - - var5 = Client.camAngleY & 2047; - var6 = class80.oculusOrbFocalPointX; - var7 = GrandExchangeOfferAgeComparator.field78; - var8 = class81.oculusOrbFocalPointY; - var9 = FloorDecoration.method2888(var18); - var9 = class14.method176(var9, var3); - var10 = 2048 - var18 & 2047; - var11 = 2048 - var5 & 2047; - var12 = 0; - int var13 = 0; - int var14 = var9; - int var15; - int var16; - int var17; - if (var10 != 0) { - var15 = Rasterizer3D.Rasterizer3D_sine[var10]; - var16 = Rasterizer3D.Rasterizer3D_cosine[var10]; - var17 = var16 * var13 - var15 * var9 >> 16; - var14 = var15 * var13 + var16 * var9 >> 16; - var13 = var17; - } - - if (var11 != 0) { - var15 = Rasterizer3D.Rasterizer3D_sine[var11]; - var16 = Rasterizer3D.Rasterizer3D_cosine[var11]; - var17 = var14 * var15 + var12 * var16 >> 16; - var14 = var16 * var14 - var15 * var12 >> 16; - var12 = var17; - } - - class30.cameraX = var6 - var12; - GameObject.cameraY = var7 - var13; - FloorDecoration.cameraZ = var8 - var14; - ItemContainer.cameraPitch = var18; - Decimator.cameraYaw = var5; - if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (class80.oculusOrbFocalPointX >> 7 != class215.localPlayer.x >> 7 || class81.oculusOrbFocalPointY >> 7 != class215.localPlayer.y >> 7)) { - var15 = class215.localPlayer.plane; - var16 = class51.baseX * 64 + (class80.oculusOrbFocalPointX >> 7); - var17 = VarcInt.baseY * 64 + (class81.oculusOrbFocalPointY >> 7); - Clock.method3555(var16, var17, var15, true); - } - } - - if (!Client.isCameraLocked) { - var18 = ClientPacket.method3660(); - } else { - if (UserComparator10.clientPreferences.roofsHidden) { - var5 = ClientPacket.Client_plane; - } else { - var6 = class195.getTileHeight(class30.cameraX, FloorDecoration.cameraZ, ClientPacket.Client_plane); - if (var6 - GameObject.cameraY < 800 && (Tiles.Tiles_renderFlags[ClientPacket.Client_plane][class30.cameraX >> 7][FloorDecoration.cameraZ >> 7] & 4) != 0) { - var5 = ClientPacket.Client_plane; - } else { - var5 = 3; - } - } - - var18 = var5; - } - - var5 = class30.cameraX; - var6 = GameObject.cameraY; - var7 = FloorDecoration.cameraZ; - var8 = ItemContainer.cameraPitch; - var9 = Decimator.cameraYaw; - - for (var10 = 0; var10 < 5; ++var10) { - if (Client.field835[var10]) { - var11 = (int)(Math.random() * (double)(Client.field736[var10] * 2 + 1) - (double)Client.field736[var10] + Math.sin((double)Client.field890[var10] / 100.0D * (double)Client.field891[var10]) * (double)Client.field901[var10]); - if (var10 == 0) { - class30.cameraX += var11; - } - - if (var10 == 1) { - GameObject.cameraY += var11; - } - - if (var10 == 2) { - FloorDecoration.cameraZ += var11; - } - - if (var10 == 3) { - Decimator.cameraYaw = var11 + Decimator.cameraYaw & 2047; - } - - if (var10 == 4) { - ItemContainer.cameraPitch += var11; - if (ItemContainer.cameraPitch < 128) { - ItemContainer.cameraPitch = 128; - } - - if (ItemContainer.cameraPitch > 383) { - ItemContainer.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) { - CollisionMap.method3628(var10 - var0, var11 - var1); - } else { - ParamDefinition.method4611(); - } - - Tiles.playPcmPlayers(); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); - Tiles.playPcmPlayers(); - var12 = Rasterizer3D.Rasterizer3D_zoom; - Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; - class2.scene.draw(class30.cameraX, GameObject.cameraY, FloorDecoration.cameraZ, ItemContainer.cameraPitch, Decimator.cameraYaw, var18); - Rasterizer3D.Rasterizer3D_zoom = var12; - Tiles.playPcmPlayers(); - class2.scene.clearTempGameObjects(); - FontName.method5426(var0, var1, var2, var3); - if (Client.hintArrowType == 2) { - TextureProvider.worldToScreen(Client.hintArrowSubX * 64 + (Client.hintArrowX - class51.baseX * 64 << 7), Client.hintArrowSubY * 64 + (Client.hintArrowY - VarcInt.baseY * 64 << 7), Client.hintArrowHeight * 2); - if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { - SequenceDefinition.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); - } - } - - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field704); - KeyHandler.method837(var0, var1, var2, var3); - class30.cameraX = var5; - GameObject.cameraY = var6; - FloorDecoration.cameraZ = var7; - ItemContainer.cameraPitch = var8; - Decimator.cameraYaw = var9; - if (Client.isLoading && ViewportMouse.method3015(true, false) == 0) { - Client.isLoading = false; - } - - if (Client.isLoading) { - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); - WorldMapIcon_1.drawLoadingMessage("Loading - please wait.", false); - } - - } - - @ObfuscatedName("kx") - @ObfuscatedSignature( - signature = "(Lbf;ZI)V", - garbageValue = "-854325632" - ) - @Export("closeInterface") - static final void closeInterface(InterfaceParent var0, boolean var1) { - int var2 = var0.group; - int var3 = (int)var0.key; - var0.remove(); - if (var1) { - DynamicObject.method2263(var2); - } - - for (IntegerNode var4 = (IntegerNode)Client.widgetClickMasks.first(); var4 != null; var4 = (IntegerNode)Client.widgetClickMasks.next()) { - if ((long)var2 == (var4.key >> 48 & 65535L)) { - var4.remove(); - } - } - - Widget var5 = Language.getWidget(var3); - if (var5 != null) { - ScriptEvent.invalidateWidget(var5); - } - - Varps.method4043(); - if (Client.rootInterface != -1) { - GrandExchangeEvents.runIntfCloseListeners(Client.rootInterface, 1); - } - - } - - @ObfuscatedName("kq") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", - garbageValue = "1" - ) - static void method823(String var0) { - WorldMapManager.field327 = var0; - - try { - String var1 = AbstractWorldMapIcon.client.getParameter(Integer.toString(18)); - String var2 = AbstractWorldMapIcon.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=" + class215.method4107(TaskHandler.currentTimeMillis() + 94608000000L) + "; Max-Age=" + 94608000L; - } - - Client var4 = AbstractWorldMapIcon.client; - String var5 = "document.cookie=\"" + var3 + "\""; - JSObject.getWindow(var4).eval(var5); - } catch (Throwable var6) { - } - - } -} diff --git a/runescape-client/src/main/java/class47.java b/runescape-client/src/main/java/class47.java deleted file mode 100644 index f23682cb5b..0000000000 --- a/runescape-client/src/main/java/class47.java +++ /dev/null @@ -1,25 +0,0 @@ -import java.applet.Applet; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import netscape.javascript.JSObject; - -@ObfuscatedName("ay") -public class class47 { - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(Ljava/applet/Applet;Ljava/lang/String;I)Ljava/lang/Object;", - garbageValue = "1388321520" - ) - public static Object method864(Applet var0, String var1) throws Throwable { - return JSObject.getWindow(var0).call(var1, (Object[])null); - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(Ljava/applet/Applet;Ljava/lang/String;[Ljava/lang/Object;I)Ljava/lang/Object;", - garbageValue = "1922524077" - ) - public static Object method865(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 deleted file mode 100644 index a1b7339a00..0000000000 --- a/runescape-client/src/main/java/class49.java +++ /dev/null @@ -1,62 +0,0 @@ -import javax.imageio.ImageIO; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("au") -public class class49 { - @ObfuscatedName("rq") - @ObfuscatedGetter( - intValue = 1686126592 - ) - static int field417; - @ObfuscatedName("cn") - @ObfuscatedGetter( - intValue = 1254436043 - ) - public static int field418; - @ObfuscatedName("et") - @ObfuscatedGetter( - intValue = -311350761 - ) - @Export("port2") - static int port2; - - static { - ImageIO.setUseCache(false); - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "(IIB)Lci;", - garbageValue = "-31" - ) - static Script method880(int var0, int var1) { - Script var2 = (Script)Script.Script_cached.get((long)(var0 << 16)); - if (var2 != null) { - return var2; - } else { - String var3 = String.valueOf(var0); - int var4 = class267.archive12.getGroupId(var3); - if (var4 == -1) { - return null; - } else { - byte[] var5 = class267.archive12.takeFileFlat(var4); - if (var5 != null) { - if (var5.length <= 1) { - return null; - } - - var2 = WorldMapArea.newScript(var5); - if (var2 != null) { - Script.Script_cached.put(var2, (long)(var0 << 16)); - return var2; - } - } - - return null; - } - } - } -} diff --git a/runescape-client/src/main/java/class51.java b/runescape-client/src/main/java/class51.java deleted file mode 100644 index a4829d01f5..0000000000 --- a/runescape-client/src/main/java/class51.java +++ /dev/null @@ -1,40 +0,0 @@ -import java.applet.Applet; -import java.awt.FontMetrics; -import java.security.SecureRandom; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ah") -public class class51 { - @ObfuscatedName("u") - @Export("applet") - public static Applet applet; - @ObfuscatedName("f") - public static String field424; - @ObfuscatedName("y") - static byte[][][] field423; - @ObfuscatedName("ag") - @Export("loginScreenFontMetrics") - static FontMetrics loginScreenFontMetrics; - @ObfuscatedName("ev") - @Export("secureRandom") - static SecureRandom secureRandom; - @ObfuscatedName("fn") - @ObfuscatedGetter( - intValue = -838256623 - ) - @Export("baseX") - static int baseX; - @ObfuscatedName("jz") - @ObfuscatedSignature( - signature = "Lhl;" - ) - static Widget field432; - - static { - applet = null; - field424 = ""; - } -} diff --git a/runescape-client/src/main/java/class60.java b/runescape-client/src/main/java/class60.java index 0522c4ebe0..58a55fc6e2 100644 --- a/runescape-client/src/main/java/class60.java +++ b/runescape-client/src/main/java/class60.java @@ -1,54 +1,411 @@ +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InvalidClassException; +import java.io.ObjectInputStream; +import java.io.OptionalDataException; +import java.io.StreamCorruptedException; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.Date; import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bq") +@ObfuscatedName("by") public class class60 { - @ObfuscatedName("qc") + @ObfuscatedName("gg") @ObfuscatedSignature( - signature = "Lde;" + signature = "[Lli;" ) - @Export("pcmPlayer1") - static PcmPlayer pcmPlayer1; - @ObfuscatedName("eg") - @ObfuscatedSignature( - signature = "Lij;" + @Export("scrollBarSprites") + static IndexedSprite[] scrollBarSprites; + @ObfuscatedName("ha") + @ObfuscatedGetter( + intValue = -1555429919 ) - @Export("archive20") - static Archive archive20; + @Export("cameraY") + static int cameraY; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Lhf;Lhf;III)Lky;", - garbageValue = "-2011149056" + signature = "(Lkl;B)V", + garbageValue = "64" ) - public static Font method1195(AbstractArchive var0, AbstractArchive var1, int var2, int var3) { - return !GraphicsObject.method2030(var0, var2, var3) ? null : FloorOverlayDefinition.method4853(var1.takeFile(var2, var3)); + @Export("performReflectionCheck") + public static void performReflectionCheck(PacketBuffer var0) { + ReflectionCheck var1 = (ReflectionCheck)class117.reflectionChecks.last(); + if (var1 != null) { + int var2 = var0.offset; + var0.writeInt(var1.id); + + for (int var3 = 0; var3 < var1.size; ++var3) { + if (var1.creationErrors[var3] != 0) { + var0.writeByte(var1.creationErrors[var3]); + } else { + try { + int var4 = var1.operations[var3]; + Field var5; + int var6; + if (var4 == 0) { + var5 = var1.fields[var3]; + var6 = Reflection.getInt(var5, (Object)null); + var0.writeByte(0); + var0.writeInt(var6); + } else if (var4 == 1) { + var5 = var1.fields[var3]; + Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); + var0.writeByte(0); + } else if (var4 == 2) { + var5 = var1.fields[var3]; + var6 = var5.getModifiers(); + var0.writeByte(0); + var0.writeInt(var6); + } + + Method var25; + if (var4 != 3) { + if (var4 == 4) { + var25 = var1.methods[var3]; + var6 = var25.getModifiers(); + var0.writeByte(0); + var0.writeInt(var6); + } + } else { + var25 = var1.methods[var3]; + byte[][] var10 = var1.arguments[var3]; + Object[] var7 = new Object[var10.length]; + + for (int var8 = 0; var8 < var10.length; ++var8) { + ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); + var7[var8] = var9.readObject(); + } + + Object var11 = Reflection.invoke(var25, (Object)null, var7); + if (var11 == null) { + var0.writeByte(0); + } else if (var11 instanceof Number) { + var0.writeByte(1); + var0.writeLong(((Number)var11).longValue()); + } else if (var11 instanceof String) { + var0.writeByte(2); + var0.writeStringCp1252NullTerminated((String)var11); + } else { + var0.writeByte(4); + } + } + } catch (ClassNotFoundException var13) { + var0.writeByte(-10); + } catch (InvalidClassException var14) { + var0.writeByte(-11); + } catch (StreamCorruptedException var15) { + var0.writeByte(-12); + } catch (OptionalDataException var16) { + var0.writeByte(-13); + } catch (IllegalAccessException var17) { + var0.writeByte(-14); + } catch (IllegalArgumentException var18) { + var0.writeByte(-15); + } catch (InvocationTargetException var19) { + var0.writeByte(-16); + } catch (SecurityException var20) { + var0.writeByte(-17); + } catch (IOException var21) { + var0.writeByte(-18); + } catch (NullPointerException var22) { + var0.writeByte(-19); + } catch (Exception var23) { + var0.writeByte(-20); + } catch (Throwable var24) { + var0.writeByte(-21); + } + } + } + + var0.writeCrc(var2); + var1.remove(); + } } - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-30" + signature = "(ILcu;ZI)I", + garbageValue = "102357643" ) - public static void method1194() { - ItemDefinition.ItemDefinition_cachedSprites.clear(); + static int method1170(int var0, Script var1, boolean var2) { + int var3 = -1; + Widget var4; + if (var0 >= 2000) { + var0 -= 1000; + var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + var4 = Tile.getWidget(var3); + } else { + var4 = var2 ? UserComparator7.field1946 : class197.field2398; + } + + if (var0 == ScriptOpcodes.CC_SETPOSITION) { + class188.Interpreter_intStackSize -= 4; + var4.rawX = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var4.rawY = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + var4.xAlignment = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 2]; + var4.yAlignment = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 3]; + LoginPacket.invalidateWidget(var4); + class206.client.alignWidget(var4); + if (var3 != -1 && var4.type == 0) { + Messages.revalidateWidgetScroll(UserComparator7.Widget_interfaceComponents[var3 >> 16], var4, false); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_SETSIZE) { + class188.Interpreter_intStackSize -= 4; + var4.rawWidth = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var4.rawHeight = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + var4.widthAlignment = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 2]; + var4.heightAlignment = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 3]; + LoginPacket.invalidateWidget(var4); + class206.client.alignWidget(var4); + if (var3 != -1 && var4.type == 0) { + Messages.revalidateWidgetScroll(UserComparator7.Widget_interfaceComponents[var3 >> 16], var4, false); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_SETHIDE) { + boolean var5 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + if (var5 != var4.isHidden) { + var4.isHidden = var5; + LoginPacket.invalidateWidget(var4); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { + var4.noClickThrough = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { + var4.noScrollThrough = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; + return 1; + } else { + return 2; + } } - @ObfuscatedName("ho") + @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-1426936698" + signature = "(ILcu;ZB)I", + garbageValue = "81" ) - static final void method1193(int var0) { - if (var0 >= 0) { - int var1 = Client.menuArguments1[var0]; - int var2 = Client.menuArguments2[var0]; - int var3 = Client.menuOpcodes[var0]; - int var4 = Client.menuIdentifiers[var0]; - String var5 = Client.menuActions[var0]; - String var6 = Client.menuTargets[var0]; - class32.menuAction(var1, var2, var3, var4, var5, var6, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); + static int method1171(int var0, Script var1, boolean var2) { + String var3; + int var4; + if (var0 == ScriptOpcodes.APPEND_NUM) { + var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3 + var4; + return 1; + } else { + String var9; + if (var0 == ScriptOpcodes.APPEND) { + class65.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[class65.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[class65.Interpreter_stringStackSize + 1]; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3 + var9; + return 1; + } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { + var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3 + class65.intToString(var4, true); + return 1; + } else if (var0 == ScriptOpcodes.LOWERCASE) { + var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3.toLowerCase(); + return 1; + } else { + int var6; + int var10; + if (var0 == ScriptOpcodes.FROMDATE) { + var10 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + long var11 = 86400000L * ((long)var10 + 11745L); + Interpreter.Interpreter_calendar.setTime(new Date(var11)); + var6 = Interpreter.Interpreter_calendar.get(5); + int var16 = Interpreter.Interpreter_calendar.get(2); + int var8 = Interpreter.Interpreter_calendar.get(1); + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var16] + "-" + var8; + return 1; + } else if (var0 != ScriptOpcodes.TEXT_GENDER) { + if (var0 == ScriptOpcodes.TOSTRING) { + var10 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = Integer.toString(var10); + return 1; + } else if (var0 == ScriptOpcodes.COMPARE) { + class65.Interpreter_stringStackSize -= 2; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = ViewportMouse.method2993(class195.compareStrings(Interpreter.Interpreter_stringStack[class65.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[class65.Interpreter_stringStackSize + 1], Varps.clientLanguage)); + return 1; + } else { + int var5; + byte[] var13; + Font var14; + if (var0 == ScriptOpcodes.PARAHEIGHT) { + var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + class188.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + var13 = WorldMapSection1.archive13.takeFile(var5, 0); + var14 = new Font(var13); + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var14.lineCount(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.PARAWIDTH) { + var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + class188.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + var13 = WorldMapSection1.archive13.takeFile(var5, 0); + var14 = new Font(var13); + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var14.lineWidth(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { + class65.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[class65.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[class65.Interpreter_stringStackSize + 1]; + if (Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1) { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3; + } else { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var9; + } + + return 1; + } else if (var0 == ScriptOpcodes.ESCAPE) { + var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); + return 1; + } else if (var0 == ScriptOpcodes.APPEND_CHAR) { + var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3 + (char)var4; + return 1; + } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { + var10 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = WorldMapID.isCharPrintable((char)var10) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { + var10 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = class191.isAlphaNumeric((char)var10) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { + var10 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = WorldMapManager.isCharAlphabetic((char)var10) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { + var10 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = class237.isDigit((char)var10) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.STRING_LENGTH) { + var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + if (var3 != null) { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.length(); + } else { + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.SUBSTRING) { + var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + class188.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3.substring(var4, var5); + return 1; + } else if (var0 == ScriptOpcodes.REMOVETAGS) { + var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + StringBuilder var17 = new StringBuilder(var3.length()); + boolean var15 = false; + + for (var6 = 0; var6 < var3.length(); ++var6) { + char var7 = var3.charAt(var6); + if (var7 == '<') { + var15 = true; + } else if (var7 == '>') { + var15 = false; + } else if (!var15) { + var17.append(var7); + } + } + + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var17.toString(); + return 1; + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { + var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.indexOf(var4); + return 1; + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { + class65.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[class65.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[class65.Interpreter_stringStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.indexOf(var9, var5); + return 1; + } else if (var0 == ScriptOpcodes.UPPERCASE) { + var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3.toUpperCase(); + return 1; + } else { + return 2; + } + } + } else { + class65.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[class65.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[class65.Interpreter_stringStackSize + 1]; + if (Message.localPlayer.appearance != null && Message.localPlayer.appearance.isFemale) { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var9; + } else { + Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3; + } + + return 1; + } + } + } + } + + @ObfuscatedName("gi") + @ObfuscatedSignature( + signature = "(IB)V", + garbageValue = "18" + ) + @Export("setWindowedMode") + static void setWindowedMode(int var0) { + Client.field841 = 0L; + if (var0 >= 2) { + Client.isResizable = true; + } else { + Client.isResizable = false; + } + + if (ItemDefinition.getWindowedMode() == 1) { + class206.client.setMaxCanvasSize(765, 503); + } else { + class206.client.setMaxCanvasSize(7680, 2160); + } + + if (Client.gameState >= 25) { + class219.method4076(); + } + + } + + @ObfuscatedName("ku") + @ObfuscatedSignature( + signature = "(Lha;I)Ljava/lang/String;", + garbageValue = "762808761" + ) + static String method1167(Widget var0) { + if (class14.method157(WorldMapSection0.getWidgetClickMask(var0)) == 0) { + return null; + } else { + return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; } } } diff --git a/runescape-client/src/main/java/class65.java b/runescape-client/src/main/java/class65.java index 8a48154022..c99052bae7 100644 --- a/runescape-client/src/main/java/class65.java +++ b/runescape-client/src/main/java/class65.java @@ -3,81 +3,634 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bb") +@ObfuscatedName("ba") public class class65 extends RouteStrategy { - @ObfuscatedName("sp") + @ObfuscatedName("d") @ObfuscatedGetter( - longValue = -1800768745141065643L + intValue = -248026877 ) - static long field604; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 44255735 + @Export("Interpreter_stringStackSize") + static int Interpreter_stringStackSize; + @ObfuscatedName("fs") + @ObfuscatedSignature( + signature = "Lki;" ) - static int field603; + @Export("WorldMapElement_fonts") + static Fonts WorldMapElement_fonts; class65() { } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(IIILfh;B)Z", - garbageValue = "-103" + signature = "(IIILfp;I)Z", + garbageValue = "1339159810" ) @Export("hasArrived") - protected boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) { + public boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) { return var2 == super.approxDestinationX && var3 == super.approxDestinationY; } + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "(Lhz;Lhz;ZLko;I)V", + garbageValue = "1687966211" + ) + public static void method1232(AbstractArchive var0, AbstractArchive var1, boolean var2, Font var3) { + UserComparator10.ItemDefinition_archive = var0; + ItemDefinition.ItemDefinition_modelArchive = var1; + ItemDefinition.ItemDefinition_inMembersWorld = var2; + ItemDefinition.ItemDefinition_fileCount = UserComparator10.ItemDefinition_archive.getGroupFileCount(10); + ReflectionCheck.ItemDefinition_fontPlain11 = var3; + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(Lkl;IB)V", + garbageValue = "-16" + ) + @Export("updatePlayers") + static final void updatePlayers(PacketBuffer var0, int var1) { + int var2 = var0.offset; + Players.Players_pendingUpdateCount = 0; + int var3 = 0; + var0.importIndex(); + + int var4; + int var5; + int var6; + int var8; + int var9; + byte[] var10000; + for (var4 = 0; var4 < Players.Players_count; ++var4) { + var5 = Players.Players_indices[var4]; + if ((Players.field1230[var5] & 1) == 0) { + if (var3 > 0) { + --var3; + var10000 = Players.field1230; + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + var6 = var0.readBits(1); + if (var6 == 0) { + var8 = var0.readBits(2); + if (var8 == 0) { + var9 = 0; + } else if (var8 == 1) { + var9 = var0.readBits(5); + } else if (var8 == 2) { + var9 = var0.readBits(8); + } else { + var9 = var0.readBits(11); + } + + var3 = var9; + var10000 = Players.field1230; + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + WorldMapAreaData.readPlayerUpdate(var0, var5); + } + } + } + } + + var0.exportIndex(); + if (var3 != 0) { + throw new RuntimeException(); + } else { + var0.importIndex(); + + for (var4 = 0; var4 < Players.Players_count; ++var4) { + var5 = Players.Players_indices[var4]; + if ((Players.field1230[var5] & 1) != 0) { + if (var3 > 0) { + --var3; + var10000 = Players.field1230; + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + var6 = var0.readBits(1); + if (var6 == 0) { + var8 = var0.readBits(2); + if (var8 == 0) { + var9 = 0; + } else if (var8 == 1) { + var9 = var0.readBits(5); + } else if (var8 == 2) { + var9 = var0.readBits(8); + } else { + var9 = var0.readBits(11); + } + + var3 = var9; + var10000 = Players.field1230; + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + WorldMapAreaData.readPlayerUpdate(var0, var5); + } + } + } + } + + var0.exportIndex(); + if (var3 != 0) { + throw new RuntimeException(); + } else { + var0.importIndex(); + + for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { + var5 = Players.Players_emptyIndices[var4]; + if ((Players.field1230[var5] & 1) != 0) { + if (var3 > 0) { + --var3; + var10000 = Players.field1230; + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + var6 = var0.readBits(1); + if (var6 == 0) { + var8 = var0.readBits(2); + if (var8 == 0) { + var9 = 0; + } else if (var8 == 1) { + var9 = var0.readBits(5); + } else if (var8 == 2) { + var9 = var0.readBits(8); + } else { + var9 = var0.readBits(11); + } + + var3 = var9; + var10000 = Players.field1230; + var10000[var5] = (byte)(var10000[var5] | 2); + } else if (WorldMapDecorationType.updateExternalPlayer(var0, var5)) { + var10000 = Players.field1230; + var10000[var5] = (byte)(var10000[var5] | 2); + } + } + } + } + + var0.exportIndex(); + if (var3 != 0) { + throw new RuntimeException(); + } else { + var0.importIndex(); + + for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { + var5 = Players.Players_emptyIndices[var4]; + if ((Players.field1230[var5] & 1) == 0) { + if (var3 > 0) { + --var3; + var10000 = Players.field1230; + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + var6 = var0.readBits(1); + if (var6 == 0) { + var8 = var0.readBits(2); + if (var8 == 0) { + var9 = 0; + } else if (var8 == 1) { + var9 = var0.readBits(5); + } else if (var8 == 2) { + var9 = var0.readBits(8); + } else { + var9 = var0.readBits(11); + } + + var3 = var9; + var10000 = Players.field1230; + var10000[var5] = (byte)(var10000[var5] | 2); + } else if (WorldMapDecorationType.updateExternalPlayer(var0, var5)) { + var10000 = Players.field1230; + var10000[var5] = (byte)(var10000[var5] | 2); + } + } + } + } + + var0.exportIndex(); + if (var3 != 0) { + throw new RuntimeException(); + } else { + Players.Players_count = 0; + Players.Players_emptyIdxCount = 0; + + Player var16; + for (var4 = 1; var4 < 2048; ++var4) { + var10000 = Players.field1230; + var10000[var4] = (byte)(var10000[var4] >> 1); + var16 = Client.players[var4]; + if (var16 != null) { + Players.Players_indices[++Players.Players_count - 1] = var4; + } else { + Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var4; + } + } + + for (var3 = 0; var3 < Players.Players_pendingUpdateCount; ++var3) { + var4 = Players.Players_pendingUpdateIndices[var3]; + var16 = Client.players[var4]; + var6 = var0.readUnsignedByte(); + if ((var6 & 128) != 0) { + var6 += var0.readUnsignedByte() << 8; + } + + byte var7 = -1; + int var11; + int var12; + int var15; + if ((var6 & 4) != 0) { + var8 = var0.readUnsignedByte(); + int var10; + int var13; + int var14; + if (var8 > 0) { + for (var9 = 0; var9 < var8; ++var9) { + var11 = -1; + var12 = -1; + var13 = -1; + var10 = var0.readUShortSmart(); + if (var10 == 32767) { + var10 = var0.readUShortSmart(); + var12 = var0.readUShortSmart(); + var11 = var0.readUShortSmart(); + var13 = var0.readUShortSmart(); + } else if (var10 != 32766) { + var12 = var0.readUShortSmart(); + } else { + var10 = -1; + } + + var14 = var0.readUShortSmart(); + var16.addHitSplat(var10, var12, var11, var13, Client.cycle, var14); + } + } + + var9 = var0.method5572(); + if (var9 > 0) { + for (var10 = 0; var10 < var9; ++var10) { + var11 = var0.readUShortSmart(); + var12 = var0.readUShortSmart(); + if (var12 != 32767) { + var13 = var0.readUShortSmart(); + var14 = var0.method5572(); + var15 = var12 > 0 ? var0.method5628() : var14; + var16.addHealthBar(var11, Client.cycle, var12, var13, var14, var15); + } else { + var16.removeHealthBar(var11); + } + } + } + } + + if ((var6 & 512) != 0) { + Players.field1231[var4] = var0.method5577(); + } + + if ((var6 & 4096) != 0) { + var16.spotAnimation = var0.readUnsignedShort(); + var8 = var0.method5591(); + var16.field963 = var8 >> 16; + var16.field943 = (var8 & 65535) + Client.cycle; + var16.spotAnimationFrame = 0; + var16.spotAnimationFrameCycle = 0; + if (var16.field943 > Client.cycle) { + var16.spotAnimationFrame = -1; + } + + if (var16.spotAnimation == 65535) { + var16.spotAnimation = -1; + } + } + + if ((var6 & 32) != 0) { + var16.targetIndex = var0.method5583(); + if (var16.targetIndex == 65535) { + var16.targetIndex = -1; + } + } + + if ((var6 & 64) != 0) { + var8 = var0.method5583(); + PlayerType var17 = (PlayerType)DynamicObject.findEnumerated(MusicPatchPcmStream.PlayerType_values(), var0.method5572()); + boolean var20 = var0.method5572() == 1; + var11 = var0.method5628(); + var12 = var0.offset; + if (var16.username != null && var16.appearance != null) { + boolean var22 = false; + if (var17.isUser && Message.friendSystem.isIgnored(var16.username)) { + var22 = true; + } + + if (!var22 && Client.field678 == 0 && !var16.isHidden) { + Players.field1242.offset = 0; + var0.method5740(Players.field1242.array, 0, var11); + Players.field1242.offset = 0; + String var18 = AbstractFont.escapeBrackets(Buddy.method5214(GraphicsObject.method2028(Players.field1242))); + var16.overheadText = var18.trim(); + var16.overheadTextColor = var8 >> 8; + var16.overheadTextEffect = var8 & 255; + var16.overheadTextCyclesRemaining = 150; + var16.isAutoChatting = var20; + var16.field937 = var16 != Message.localPlayer && var17.isUser && "" != Client.field846 && var18.toLowerCase().indexOf(Client.field846) == -1; + if (var17.isPrivileged) { + var15 = var20 ? 91 : 1; + } else { + var15 = var20 ? 90 : 2; + } + + if (var17.modIcon != -1) { + class83.addGameMessage(var15, ChatChannel.method2269(var17.modIcon) + var16.username.getName(), var18); + } else { + class83.addGameMessage(var15, var16.username.getName(), var18); + } + } + } + + var0.offset = var12 + var11; + } + + if ((var6 & 1) != 0) { + var16.field960 = var0.readUnsignedShort(); + if (var16.pathLength == 0) { + var16.orientation = var16.field960; + var16.field960 = -1; + } + } + + if ((var6 & 2048) != 0) { + var7 = var0.readByte(); + } + + if ((var6 & 8) != 0) { + var8 = var0.method5572(); + byte[] var23 = new byte[var8]; + Buffer var19 = new Buffer(var23); + var0.method5593(var23, 0, var8); + Players.field1228[var4] = var19; + var16.read(var19); + } + + if ((var6 & 2) != 0) { + var8 = var0.method5582(); + if (var8 == 65535) { + var8 = -1; + } + + var9 = var0.method5675(); + BuddyRankComparator.performPlayerAnimation(var16, var8, var9); + } + + if ((var6 & 256) != 0) { + var16.field921 = var0.method5577(); + var16.field966 = var0.method5577(); + var16.field965 = var0.method5577(); + var16.field929 = var0.readByte(); + var16.field950 = var0.readUnsignedShort() + Client.cycle; + var16.field969 = var0.method5723() + Client.cycle; + var16.field970 = var0.method5583(); + if (var16.field616) { + var16.field921 += var16.tileX; + var16.field966 += var16.tileY; + var16.field965 += var16.tileX; + var16.field929 += var16.tileY; + var16.pathLength = 0; + } else { + var16.field921 += var16.pathX[0]; + var16.field966 += var16.pathY[0]; + var16.field965 += var16.pathX[0]; + var16.field929 += var16.pathY[0]; + var16.pathLength = 1; + } + + var16.field926 = 0; + } + + if ((var6 & 16) != 0) { + var16.overheadText = var0.readStringCp1252NullTerminated(); + if (var16.overheadText.charAt(0) == '~') { + var16.overheadText = var16.overheadText.substring(1); + class83.addGameMessage(2, var16.username.getName(), var16.overheadText); + } else if (var16 == Message.localPlayer) { + class83.addGameMessage(2, var16.username.getName(), var16.overheadText); + } + + var16.isAutoChatting = false; + var16.overheadTextColor = 0; + var16.overheadTextEffect = 0; + var16.overheadTextCyclesRemaining = 150; + } + + if ((var6 & 1024) != 0) { + for (var8 = 0; var8 < 3; ++var8) { + var16.actions[var8] = var0.readStringCp1252NullTerminated(); + } + } + + if (var16.field616) { + if (var7 == 127) { + var16.resetPath(var16.tileX, var16.tileY); + } else { + byte var21; + if (var7 != -1) { + var21 = var7; + } else { + var21 = Players.field1231[var4]; + } + + var16.method1261(var16.tileX, var16.tileY, var21); + } + } + } + + if (var0.offset - var2 != var1) { + throw new RuntimeException(var0.offset - var2 + " " + var1); + } + } + } + } + } + } + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(Lhf;IIIZI)V", - garbageValue = "-1389497499" + signature = "(IZI)Ljava/lang/String;", + garbageValue = "2010255581" ) - @Export("playMusicTrack") - public static void playMusicTrack(AbstractArchive var0, int var1, int var2, int var3, boolean var4) { - class197.field2411 = 1; - class197.musicTrackArchive = var0; - UrlRequester.musicTrackGroupId = var1; - UserComparator7.musicTrackFileId = var2; - class197.musicTrackVolume = var3; - ArchiveLoader.musicTrackBoolean = var4; - class335.field4014 = 10000; + @Export("intToString") + public static String intToString(int var0, boolean var1) { + return var1 && var0 >= 0 ? WorldMapData_0.method163(var0, 10, var1) : Integer.toString(var0); } - @ObfuscatedName("k") + @ObfuscatedName("hm") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "1885600103" + signature = "(IIIIIIIIIB)V", + garbageValue = "104" ) - static final void method1244(String var0) { - WorldMapSection2.method347(var0 + " is already on your friend list"); - } + @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; - @ObfuscatedName("iq") - @ObfuscatedSignature( - signature = "(IIIIIIIII)V", - garbageValue = "-1636724870" - ) - @Export("drawWidgets") - static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (UserComparator3.loadInterface(var0)) { - class4.field22 = null; - class40.drawInterface(FloorDecoration.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); - if (class4.field22 != null) { - class40.drawInterface(class4.field22, -1412584499, var1, var2, var3, var4, WorldMapSection2.field200, TilePaint.field1782, var7); - class4.field22 = 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; } + } - } else { - if (var7 != -1) { - Client.field847[var7] = true; - } else { - for (int var8 = 0; var8 < 100; ++var8) { - Client.field847[var8] = true; + if (var9 == null) { + var9 = new PendingSpawn(); + var9.plane = var0; + var9.type = var3; + var9.x = var1; + var9.y = var2; + SequenceDefinition.method4821(var9); + Client.pendingSpawns.addFirst(var9); + } + + var9.id = var4; + var9.field918 = var5; + var9.orientation = var6; + var9.delay = var7; + var9.hitpoints = var8; + } + + @ObfuscatedName("ho") + @ObfuscatedSignature( + signature = "(Lkl;I)V", + garbageValue = "-1944443649" + ) + static final void method1228(PacketBuffer var0) { + for (int var1 = 0; var1 < Client.field673; ++var1) { + int var2 = Client.field720[var1]; + NPC var3 = Client.npcs[var2]; + int var4 = var0.readUnsignedByte(); + int var5; + int var6; + int var7; + if ((var4 & 64) != 0) { + var5 = var0.method5582(); + if (var5 == 65535) { + var5 = -1; + } + + var6 = var0.method5675(); + if (var5 == var3.sequence && var5 != -1) { + var7 = WorldMapSection0.SequenceDefinition_get(var5).field3495; + if (var7 == 1) { + var3.sequenceFrame = 0; + var3.sequenceFrameCycle = 0; + var3.sequenceDelay = var6; + var3.field958 = 0; + } + + if (var7 == 2) { + var3.field958 = 0; + } + } else if (var5 == -1 || var3.sequence == -1 || WorldMapSection0.SequenceDefinition_get(var5).field3492 >= WorldMapSection0.SequenceDefinition_get(var3.sequence).field3492) { + var3.sequence = var5; + var3.sequenceFrame = 0; + var3.sequenceFrameCycle = 0; + var3.sequenceDelay = var6; + var3.field958 = 0; + var3.field926 = var3.pathLength; } } + if ((var4 & 8) != 0) { + var3.targetIndex = var0.method5723(); + if (var3.targetIndex == 65535) { + var3.targetIndex = -1; + } + } + + if ((var4 & 1) != 0) { + var3.overheadText = var0.readStringCp1252NullTerminated(); + var3.overheadTextCyclesRemaining = 100; + } + + if ((var4 & 4) != 0) { + var3.definition = AbstractUserComparator.getNpcDefinition(var0.method5582()); + var3.field925 = var3.definition.size; + var3.field968 = var3.definition.rotation; + var3.walkSequence = var3.definition.walkSequence; + var3.walkBackSequence = var3.definition.walkBackSequence; + var3.walkLeftSequence = var3.definition.walkLeftSequence; + var3.walkRightSequence = var3.definition.walkRightSequence; + var3.readySequence = var3.definition.readySequence; + var3.turnLeftSequence = var3.definition.turnLeftSequence; + var3.turnRightSequence = var3.definition.turnRightSequence; + } + + int var8; + if ((var4 & 2) != 0) { + var5 = var0.method5628(); + int var9; + int var10; + int var11; + if (var5 > 0) { + for (var6 = 0; var6 < var5; ++var6) { + var8 = -1; + var9 = -1; + var10 = -1; + var7 = var0.readUShortSmart(); + if (var7 == 32767) { + var7 = var0.readUShortSmart(); + var9 = var0.readUShortSmart(); + var8 = var0.readUShortSmart(); + var10 = var0.readUShortSmart(); + } else if (var7 != 32766) { + var9 = var0.readUShortSmart(); + } else { + var7 = -1; + } + + var11 = var0.readUShortSmart(); + var3.addHitSplat(var7, var9, var8, var10, Client.cycle, var11); + } + } + + var6 = var0.readUnsignedByte(); + if (var6 > 0) { + for (var7 = 0; var7 < var6; ++var7) { + var8 = var0.readUShortSmart(); + var9 = var0.readUShortSmart(); + if (var9 != 32767) { + var10 = var0.readUShortSmart(); + var11 = var0.method5675(); + int var12 = var9 > 0 ? var0.method5675() : var11; + var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12); + } else { + var3.removeHealthBar(var8); + } + } + } + } + + if ((var4 & 16) != 0) { + var5 = var0.readUnsignedShort(); + var6 = var0.method5723(); + var7 = var3.x - (var5 - MusicPatchPcmStream.baseX * 64 - MusicPatchPcmStream.baseX * 64) * 64; + var8 = var3.y - (var6 - ScriptEvent.baseY * 64 - ScriptEvent.baseY * 64) * 64; + if (var7 != 0 || var8 != 0) { + var3.field960 = (int)(Math.atan2((double)var7, (double)var8) * 325.949D) & 2047; + } + } + + if ((var4 & 32) != 0) { + var3.spotAnimation = var0.method5582(); + var5 = var0.method5592(); + var3.field963 = var5 >> 16; + var3.field943 = (var5 & 65535) + Client.cycle; + var3.spotAnimationFrame = 0; + var3.spotAnimationFrameCycle = 0; + if (var3.field943 > Client.cycle) { + var3.spotAnimationFrame = -1; + } + + if (var3.spotAnimation == 65535) { + var3.spotAnimation = -1; + } + } } + } } diff --git a/runescape-client/src/main/java/class80.java b/runescape-client/src/main/java/class80.java index d1b518699a..f7af343d3c 100644 --- a/runescape-client/src/main/java/class80.java +++ b/runescape-client/src/main/java/class80.java @@ -4,654 +4,63 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cv") +@ObfuscatedName("cd") public class class80 { - @ObfuscatedName("z") - static final BigInteger field1129; - @ObfuscatedName("p") - static final BigInteger field1130; - @ObfuscatedName("hz") + @ObfuscatedName("rm") @ObfuscatedGetter( - intValue = -1429349443 + intValue = 638664704 ) - @Export("oculusOrbFocalPointX") - static int oculusOrbFocalPointX; + static int field1111; + @ObfuscatedName("p") + static final BigInteger field1109; + @ObfuscatedName("b") + static final BigInteger field1112; + @ObfuscatedName("bj") + @Export("otp") + static String otp; static { - field1129 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); - field1130 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); + field1109 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); + field1112 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); } - @ObfuscatedName("gv") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lbt;IIIIII)V", - garbageValue = "-309785570" + signature = "(IIB)I", + garbageValue = "-52" ) - @Export("drawActor2d") - static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { - if (var0 != null && var0.isVisible()) { - if (var0 instanceof NPC) { - NPCDefinition var6 = ((NPC)var0).definition; - if (var6.transforms != null) { - var6 = var6.transform(); - } - - if (var6 == null) { - return; - } + static int method2053(int var0, int var1) { + if (var0 == -2) { + return 12345678; + } else if (var0 == -1) { + if (var1 < 0) { + var1 = 0; + } else if (var1 > 127) { + var1 = 127; } - int var75 = Players.Players_count; - int[] var7 = Players.Players_indices; - byte var8 = 0; - int var10; - if (var1 < var75 && var0.playerCycle == Client.cycle && class30.method563((Player)var0)) { - Player var9 = (Player)var0; - if (var1 < var75) { - var10 = var0.defaultHeight + 15; - TextureProvider.worldToScreen(var0.x, var0.y, var10); - AbstractFont var11 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); - byte var12 = 9; - var11.drawCentered(var9.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var12, 16777215, 0); - var8 = 18; - } - } - - int var76 = -2; - int var15; - int var16; - int var22; - int var23; - if (!var0.healthBars.method4911()) { - ItemContainer.getActorScreenLocation(var0, var0.defaultHeight + 15); - - for (HealthBar var77 = (HealthBar)var0.healthBars.last(); var77 != null; var77 = (HealthBar)var0.healthBars.previous()) { - HealthBarUpdate var89 = var77.get(Client.cycle); - if (var89 == null) { - if (var77.isEmpty()) { - var77.remove(); - } - } else { - HealthBarDefinition var78 = var77.definition; - Sprite var13 = var78.getBackSprite(); - Sprite var14 = var78.getFrontSprite(); - var16 = 0; - if (var13 != null && var14 != null) { - if (var78.widthPadding * 2 < var14.subWidth) { - var16 = var78.widthPadding; - } - - var15 = var14.subWidth - var16 * 2; - } else { - var15 = var78.width; - } - - int var17 = 255; - boolean var18 = true; - int var19 = Client.cycle - var89.cycle; - int var20 = var15 * var89.health2 / var78.width; - int var21; - int var92; - if (var89.cycleOffset > var19) { - var21 = var78.int4 == 0 ? 0 : var78.int4 * (var19 / var78.int4); - var22 = var15 * var89.health / var78.width; - var92 = var21 * (var20 - var22) / var89.cycleOffset + var22; - } else { - var92 = var20; - var21 = var89.cycleOffset + var78.int5 - var19; - if (var78.int3 >= 0) { - var17 = (var21 << 8) / (var78.int5 - var78.int3); - } - } - - if (var89.health2 > 0 && var92 < 1) { - var92 = 1; - } - - if (var13 != null && var14 != null) { - if (var15 == var92) { - var92 += var16 * 2; - } else { - var92 += var16; - } - - var21 = var13.subHeight; - var76 += var21; - var22 = var2 + Client.viewportTempX - (var15 >> 1); - var23 = var3 + Client.viewportTempY - var76; - var22 -= var16; - if (var17 >= 0 && var17 < 255) { - var13.drawTransAt(var22, var23, var17); - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var92, var23 + var21); - var14.drawTransAt(var22, var23, var17); - } else { - var13.drawTransBgAt(var22, var23); - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var92, var23 + var21); - var14.drawTransBgAt(var22, var23); - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); - var76 += 2; - } else { - var76 += 5; - if (Client.viewportTempX > -1) { - var21 = var2 + Client.viewportTempX - (var15 >> 1); - var22 = var3 + Client.viewportTempY - var76; - Rasterizer2D.Rasterizer2D_fillRectangle(var21, var22, var92, 5, 65280); - Rasterizer2D.Rasterizer2D_fillRectangle(var21 + var92, var22, var15 - var92, 5, 16711680); - } - - var76 += 2; - } - } - } - } - - if (var76 == -2) { - var76 += 7; - } - - var76 += var8; - int var79; - if (var1 < var75) { - Player var94 = (Player)var0; - if (var94.isHidden) { - return; - } - - if (var94.headIconPk != -1 || var94.headIconPrayer != -1) { - ItemContainer.getActorScreenLocation(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - if (var94.headIconPk != -1) { - var76 += 25; - FontName.headIconPkSprites[var94.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); - } - - if (var94.headIconPrayer != -1) { - var76 += 25; - UrlRequest.headIconPrayerSprites[var94.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); - } - } - } - - if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { - var79 = var0.defaultHeight + 15; - TextureProvider.worldToScreen(var0.x, var0.y, var79); - if (Client.viewportTempX > -1) { - var76 += SequenceDefinition.headIconHintSprites[1].subHeight; - SequenceDefinition.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); - } - } - } else { - NPCDefinition var95 = ((NPC)var0).definition; - if (var95.transforms != null) { - var95 = var95.transform(); - } - - if (var95.headIconPrayer >= 0 && var95.headIconPrayer < UrlRequest.headIconPrayerSprites.length) { - ItemContainer.getActorScreenLocation(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - UrlRequest.headIconPrayerSprites[var95.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); - } - } - - if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { - ItemContainer.getActorScreenLocation(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - SequenceDefinition.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); - } - } - } - - if (var0.overheadText != null && (var1 >= var75 || !var0.field950 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { - ItemContainer.getActorScreenLocation(var0, var0.defaultHeight); - if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { - Client.overheadTextXOffsets[Client.overheadTextCount] = JagexCache.fontBold12.stringWidth(var0.overheadText) / 2; - Client.overheadTextAscents[Client.overheadTextCount] = JagexCache.fontBold12.ascent; - Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX; - Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY; - Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor; - Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect; - Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining; - Client.overheadText[Client.overheadTextCount] = var0.overheadText; - ++Client.overheadTextCount; - } - } - - for (var10 = 0; var10 < 4; ++var10) { - var79 = var0.hitSplatCycles[var10]; - int var90 = var0.hitSplatTypes[var10]; - HitSplatDefinition var91 = null; - int var80 = 0; - HitSplatDefinition var81; - if (var90 >= 0) { - if (var79 <= Client.cycle) { - continue; - } - - var16 = var0.hitSplatTypes[var10]; - var81 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var16); - HitSplatDefinition var82; - if (var81 != null) { - var82 = var81; - } else { - byte[] var84 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var16); - var81 = new HitSplatDefinition(); - if (var84 != null) { - var81.decode(new Buffer(var84)); - } - - HitSplatDefinition.HitSplatDefinition_cached.put(var81, (long)var16); - var82 = var81; - } - - var91 = var82; - var80 = var82.field3338; - if (var82 != null && var82.transforms != null) { - var91 = var82.transform(); - if (var91 == null) { - var0.hitSplatCycles[var10] = -1; - continue; - } - } - } else if (var79 < 0) { - continue; - } - - var15 = var0.hitSplatTypes2[var10]; - HitSplatDefinition var83 = null; - HitSplatDefinition var96; - if (var15 >= 0) { - var96 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var15); - if (var96 != null) { - var81 = var96; - } else { - byte[] var85 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var15); - var96 = new HitSplatDefinition(); - if (var85 != null) { - var96.decode(new Buffer(var85)); - } - - HitSplatDefinition.HitSplatDefinition_cached.put(var96, (long)var15); - var81 = var96; - } - - var83 = var81; - if (var81 != null && var81.transforms != null) { - var83 = var81.transform(); - } - } - - if (var79 - var80 <= Client.cycle) { - if (var91 == null) { - var0.hitSplatCycles[var10] = -1; - } else { - ItemContainer.getActorScreenLocation(var0, var0.defaultHeight / 2); - if (Client.viewportTempX > -1) { - if (var10 == 1) { - Client.viewportTempY -= 20; - } - - if (var10 == 2) { - Client.viewportTempX -= 15; - Client.viewportTempY -= 10; - } - - if (var10 == 3) { - Client.viewportTempX += 15; - Client.viewportTempY -= 10; - } - - var96 = null; - Sprite var97 = null; - Sprite var86 = null; - Sprite var87 = 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; - Sprite var98 = var91.method4662(); - int var43; - if (var98 != null) { - var22 = var98.subWidth; - var43 = var98.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var26 = var98.xOffset; - } - - var97 = var91.method4663(); - if (var97 != null) { - var23 = var97.subWidth; - var43 = var97.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var27 = var97.xOffset; - } - - var86 = var91.method4671(); - if (var86 != null) { - var24 = var86.subWidth; - var43 = var86.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var28 = var86.xOffset; - } - - var87 = var91.method4657(); - if (var87 != null) { - var25 = var87.subWidth; - var43 = var87.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var29 = var87.xOffset; - } - - if (var83 != null) { - var30 = var83.method4662(); - if (var30 != null) { - var34 = var30.subWidth; - var43 = var30.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var38 = var30.xOffset; - } - - var31 = var83.method4663(); - if (var31 != null) { - var35 = var31.subWidth; - var43 = var31.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var39 = var31.xOffset; - } - - var32 = var83.method4671(); - if (var32 != null) { - var36 = var32.subWidth; - var43 = var32.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var40 = var32.xOffset; - } - - var33 = var83.method4657(); - if (var33 != null) { - var37 = var33.subWidth; - var43 = var33.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var41 = var33.xOffset; - } - } - - Font var88 = var91.getFont(); - if (var88 == null) { - var88 = AttackOption.fontPlain11; - } - - Font var44; - if (var83 != null) { - var44 = var83.getFont(); - if (var44 == null) { - var44 = AttackOption.fontPlain11; - } - } else { - var44 = AttackOption.fontPlain11; - } - - String var45 = null; - String var46 = null; - boolean var47 = false; - int var48 = 0; - var45 = var91.getString(var0.hitSplatValues[var10]); - int var93 = var88.stringWidth(var45); - if (var83 != null) { - var46 = var83.getString(var0.hitSplatValues2[var10]); - var48 = var44.stringWidth(var46); - } - - int var49 = 0; - int var50 = 0; - if (var23 > 0) { - if (var86 == null && var87 == null) { - var49 = 1; - } else { - var49 = var93 / var23 + 1; - } - } - - if (var83 != 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 (var83 != 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[var10] - Client.cycle; - int var63 = var91.field3343 - var62 * var91.field3343 / var91.field3338; - int var64 = var62 * var91.field3327 / var91.field3338 + -var91.field3327; - int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1)); - int var66 = var3 + Client.viewportTempY - 12 + var64; - int var67 = var66; - int var68 = var66 + var42; - int var69 = var66 + var91.field3333 + 15; - int var70 = var69 - var88.maxAscent; - int var71 = var69 + var88.maxDescent; - if (var70 < var66) { - var67 = var70; - } - - if (var71 > var68) { - var68 = var71; - } - - int var72 = 0; - int var73; - int var74; - if (var83 != null) { - var72 = var66 + var83.field3333 + 15; - var73 = var72 - var44.maxAscent; - var74 = var72 + var44.maxDescent; - if (var73 < var67) { - ; - } - - if (var74 > var68) { - ; - } - } - - var73 = 255; - if (var91.field3348 >= 0) { - var73 = (var62 << 8) / (var91.field3338 - var91.field3348); - } - - if (var73 >= 0 && var73 < 255) { - if (var98 != null) { - var98.drawTransAt(var52 + var65 - var26, var66, var73); - } - - if (var86 != null) { - var86.drawTransAt(var65 + var53 - var28, var66, var73); - } - - if (var97 != null) { - for (var74 = 0; var74 < var49; ++var74) { - var97.drawTransAt(var23 * var74 + (var65 + var54 - var27), var66, var73); - } - } - - if (var87 != null) { - var87.drawTransAt(var56 + var65 - var29, var66, var73); - } - - var88.drawAlpha(var45, var55 + var65, var69, var91.textColor, 0, var73); - if (var83 != 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, var83.textColor, 0, var73); - } - } else { - if (var98 != null) { - var98.drawTransBgAt(var65 + var52 - var26, var66); - } - - if (var86 != null) { - var86.drawTransBgAt(var53 + var65 - var28, var66); - } - - if (var97 != null) { - for (var74 = 0; var74 < var49; ++var74) { - var97.drawTransBgAt(var23 * var74 + (var65 + var54 - var27), var66); - } - } - - if (var87 != null) { - var87.drawTransBgAt(var56 + var65 - var29, var66); - } - - var88.draw(var45, var55 + var65, var69, var91.textColor | -16777216, 0); - if (var83 != null) { - if (var30 != null) { - var30.drawTransBgAt(var57 + var65 - var38, var66); - } - - if (var32 != null) { - var32.drawTransBgAt(var65 + var58 - var40, var66); - } - - if (var31 != null) { - for (var74 = 0; var74 < var50; ++var74) { - var31.drawTransBgAt(var74 * var35 + (var65 + var59 - var39), var66); - } - } - - if (var33 != null) { - var33.drawTransBgAt(var65 + var60 - var41, var66); - } - - var44.draw(var46, var61 + var65, var72, var83.textColor | -16777216, 0); - } - } - } - } - } + var1 = 127 - var1; + return var1; + } else { + var1 = (var0 & 127) * var1 / 128; + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; } + return (var0 & 65408) + var1; } } + + @ObfuscatedName("b") + @ObfuscatedSignature( + signature = "(Lhz;Ljava/lang/String;Ljava/lang/String;B)[Lls;", + garbageValue = "-8" + ) + public static Sprite[] method2058(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); + int var4 = var0.getFileId(var3, var2); + return GrandExchangeOfferNameComparator.SpriteBuffer_getSpriteArray(var0, var3, var4); + } } diff --git a/runescape-client/src/main/java/class81.java b/runescape-client/src/main/java/class81.java index 177183855c..7cfc6e3798 100644 --- a/runescape-client/src/main/java/class81.java +++ b/runescape-client/src/main/java/class81.java @@ -1,234 +1,213 @@ +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("cl") +@ObfuscatedName("cj") public class class81 { - @ObfuscatedName("w") + @ObfuscatedName("nd") @ObfuscatedGetter( - intValue = -1420031355 + intValue = -122722745 ) - @Export("ItemDefinition_fileCount") - public static int ItemDefinition_fileCount; - @ObfuscatedName("do") + static int field1126; + @ObfuscatedName("z") + public static String field1129; + + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lij;" + signature = "(Ljava/lang/String;Ljava/lang/String;II)Ljava/io/File;", + garbageValue = "855544439" ) - @Export("archive10") - static Archive archive10; - @ObfuscatedName("ho") - @ObfuscatedGetter( - intValue = 1548225329 - ) - @Export("oculusOrbFocalPointY") - static int oculusOrbFocalPointY; + static File method2064(String var0, String var1, int var2) { + String var3 = var2 == 0 ? "" : "" + var2; + DefaultsGroup.JagexCache_locationFile = new File(ReflectionCheck.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var3 + ".dat"); + String var4 = null; + String var5 = null; + boolean var6 = false; + Buffer var8; + File var23; + if (DefaultsGroup.JagexCache_locationFile.exists()) { + try { + AccessFile var7 = new AccessFile(DefaultsGroup.JagexCache_locationFile, "rw", 10000L); - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "1888089163" - ) - public static boolean method2086(int var0) { - return var0 >= WorldMapDecorationType.field2748.id && var0 <= WorldMapDecorationType.field2730.id || var0 == WorldMapDecorationType.field2731.id; - } - - @ObfuscatedName("eo") - @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "-53" - ) - @Export("updateGameState") - static void updateGameState(int var0) { - if (var0 != Client.gameState) { - if (Client.gameState == 0) { - AbstractWorldMapIcon.client.method991(); - } - - if (var0 == 20 || var0 == 40 || var0 == 45) { - Client.loginState = 0; - Client.field887 = 0; - Client.field678 = 0; - Client.timer.method5073(var0); - if (var0 != 20) { - Canvas.method872(false); - } - } - - if (var0 != 20 && var0 != 40 && PcmPlayer.field1413 != null) { - PcmPlayer.field1413.close(); - PcmPlayer.field1413 = null; - } - - if (Client.gameState == 25) { - Client.field699 = 0; - Client.field676 = 0; - Client.field794 = 1; - Client.field850 = 0; - Client.field672 = 1; - } - - if (var0 != 5 && var0 != 10) { - if (var0 == 20) { - WorldMapRegion.method505(archive10, WorldMapRegion.archive8, true, Client.gameState == 11 ? 4 : 0); - } else if (var0 == 11) { - WorldMapRegion.method505(archive10, WorldMapRegion.archive8, false, 4); - } else if (Login.field1194) { - Login.titleboxSprite = null; - Login.titlebuttonSprite = null; - StructDefinition.runesSprite = null; - AbstractByteArrayCopier.leftTitleSprite = null; - class319.rightTitleSprite = null; - Decimator.logoSprite = null; - Login.title_muteSprite = null; - InterfaceParent.options_buttons_0Sprite = null; - Varps.options_buttons_2Sprite = null; - class42.worldSelectBackSprites = null; - ItemContainer.worldSelectFlagSprites = null; - class40.worldSelectArrows = null; - GraphicsObject.worldSelectStars = null; - class42.field364 = null; - DynamicObject.loginScreenRunesAnimation.method1828(); - UrlRequest.method3358(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; - } + 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(); } - - Login.field1194 = false; } - } else { - WorldMapRegion.method505(archive10, WorldMapRegion.archive8, true, 0); + + 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(); } - Client.gameState = var0; + if (var4 != null) { + var23 = new File(var4); + if (!var23.exists()) { + var4 = null; + } + } + + if (var4 != null) { + var23 = new File(var4, "test.dat"); + if (!class173.method3561(var23, true)) { + var4 = null; + } + } } + + if (var4 == null && var2 == 0) { + label142: + for (int var15 = 0; var15 < WorldMapSprite.field219.length; ++var15) { + for (int var16 = 0; var16 < JagexCache.field2024.length; ++var16) { + File var17 = new File(JagexCache.field2024[var16] + WorldMapSprite.field219[var15] + File.separatorChar + var0 + File.separatorChar); + if (var17.exists() && class173.method3561(new File(var17, "test.dat"), true)) { + var4 = var17.toString(); + var6 = true; + break label142; + } + } + } + } + + if (var4 == null) { + var4 = ReflectionCheck.userHomeDirectory + File.separatorChar + "jagexcache" + var3 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; + var6 = true; + } + + File var22; + if (var5 != null) { + var22 = new File(var5); + var23 = new File(var4); + + try { + File[] var24 = var22.listFiles(); + File[] var18 = var24; + + for (int var11 = 0; var11 < var18.length; ++var11) { + File var12 = var18[var11]; + File var13 = new File(var23, var12.getName()); + boolean var14 = var12.renameTo(var13); + if (!var14) { + throw new IOException(); + } + } + } catch (Exception var20) { + var20.printStackTrace(); + } + + var6 = true; + } + + if (var6) { + var22 = new File(var4); + var8 = null; + + try { + AccessFile var25 = new AccessFile(DefaultsGroup.JagexCache_locationFile, "rw", 10000L); + Buffer var26 = new Buffer(500); + var26.writeByte(3); + var26.writeByte(var8 != null ? 1 : 0); + var26.writeCESU8(var22.getPath()); + if (var8 != null) { + var26.writeCESU8(""); + } + + var25.write(var26.array, 0, var26.offset); + var25.close(); + } catch (IOException var19) { + var19.printStackTrace(); + } + } + + return new File(var4); } - @ObfuscatedName("fk") + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(Ljava/lang/CharSequence;I)I", + garbageValue = "998758859" + ) + @Export("hashString") + public static int hashString(CharSequence var0) { + int var1 = var0.length(); + int var2 = 0; + + for (int var3 = 0; var3 < var1; ++var3) { + var2 = (var2 << 5) - var2 + NetSocket.charToByteCp1252(var0.charAt(var3)); + } + + return var2; + } + + @ObfuscatedName("fc") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-2006396000" + garbageValue = "1389817543" ) - static final void method2084() { - for (int var0 = 0; var0 < Client.soundEffectCount; ++var0) { - int var10002 = Client.queuedSoundEffectDelays[var0]--; - if (Client.queuedSoundEffectDelays[var0] >= -10) { - SoundEffect var9 = Client.soundEffects[var0]; - if (var9 == null) { - Object var10000 = null; - var9 = SoundEffect.readSoundEffect(SpriteMask.archive4, Client.soundEffectIds[var0], 0); - if (var9 == null) { - continue; - } - - int[] var13 = Client.queuedSoundEffectDelays; - var13[var0] += var9.calculateDelay(); - Client.soundEffects[var0] = var9; - } - - if (Client.queuedSoundEffectDelays[var0] < 0) { - int var2; - if (Client.soundLocations[var0] != 0) { - int var3 = (Client.soundLocations[var0] & 255) * 128; - int var4 = Client.soundLocations[var0] >> 16 & 255; - int var5 = var4 * 128 + 64 - class215.localPlayer.x; - if (var5 < 0) { - var5 = -var5; - } - - int var6 = Client.soundLocations[var0] >> 8 & 255; - int var7 = var6 * 128 + 64 - class215.localPlayer.y; - if (var7 < 0) { - var7 = -var7; - } - - int var8 = var5 + var7 - 128; - if (var8 > var3) { - Client.queuedSoundEffectDelays[var0] = -100; - continue; - } - - if (var8 < 0) { - var8 = 0; - } - - var2 = (var3 - var8) * Client.areaSoundEffectVolume / var3; - } else { - var2 = Client.soundEffectVolume; - } - - if (var2 > 0) { - RawSound var10 = var9.toRawSound().resample(LoginScreenAnimation.decimator); - RawPcmStream var11 = RawPcmStream.createRawPcmStream(var10, 100, var2); - var11.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1); - ClientPacket.pcmStreamMixer.addSubStream(var11); - } - - Client.queuedSoundEffectDelays[var0] = -100; - } - } else { - --Client.soundEffectCount; - - for (int var1 = var0; var1 < Client.soundEffectCount; ++var1) { - Client.soundEffectIds[var1] = Client.soundEffectIds[var1 + 1]; - Client.soundEffects[var1] = Client.soundEffects[var1 + 1]; - Client.queuedSoundEffectLoops[var1] = Client.queuedSoundEffectLoops[var1 + 1]; - Client.queuedSoundEffectDelays[var1] = Client.queuedSoundEffectDelays[var1 + 1]; - Client.soundLocations[var1] = Client.soundLocations[var1 + 1]; - } - - --var0; - } - } - - if (Client.field742) { - boolean var12; - if (class197.field2411 != 0) { - var12 = true; - } else { - var12 = FaceNormal.midiPcmStream.isReady(); - } - - if (!var12) { - if (Client.musicVolume != 0 && Client.currentTrackGroupId != -1) { - class65.playMusicTrack(AbstractWorldMapData.archive6, Client.currentTrackGroupId, 0, Client.musicVolume, false); - } - - Client.field742 = false; - } - } - - } - - @ObfuscatedName("ff") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "667770085" - ) - static final void method2085() { - int var0 = Players.Players_count; - int[] var1 = Players.Players_indices; - - for (int var2 = 0; var2 < var0; ++var2) { - Player var3 = Client.players[var1[var2]]; - if (var3 != null) { - class3.updateActorSequence(var3, 1); - } - } - + static final void method2063() { + PacketBufferNode.method3587(); + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); + KitDefinition.KitDefinition_cached.clear(); + class189.method3623(); + class237.method4300(); + class54.method1104(); + class286.method5310(); + MusicPatchNode2.method3668(); + Huffman.method3917(); + Actor.method1756(); + HitSplatDefinition.HitSplatDefinition_cached.clear(); + HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); + HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); + class226.method4100(); + GrandExchangeOfferAgeComparator.method146(); + class16.method179(); + WorldMapElement.WorldMapElement_cachedSprites.clear(); + class14.method155(); + Widget.Widget_cachedSprites.clear(); + Widget.Widget_cachedModels.clear(); + Widget.Widget_cachedFonts.clear(); + Widget.Widget_cachedSpriteMasks.clear(); + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); + Script.Script_cached.clear(); + ClientPacket.archive0.clearFiles(); + ItemDefinition.archive1.clearFiles(); + WorldMapData_1.archive3.clearFiles(); + FloorDecoration.archive4.clearFiles(); + AbstractWorldMapData.archive5.clearFiles(); + GrandExchangeOfferWorldComparator.archive6.clearFiles(); + MouseRecorder.archive7.clearFiles(); + class3.archive8.clearFiles(); + WorldMapManager.archive9.clearFiles(); + ServerBuild.archive10.clearFiles(); + class48.archive11.clearFiles(); + SoundSystem.archive12.clearFiles(); } } diff --git a/runescape-client/src/main/java/class83.java b/runescape-client/src/main/java/class83.java index 8c2d0924e3..56c8d0e83f 100644 --- a/runescape-client/src/main/java/class83.java +++ b/runescape-client/src/main/java/class83.java @@ -2,115 +2,49 @@ import java.math.BigInteger; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ch") +@ObfuscatedName("cb") public class class83 { - @ObfuscatedName("u") - static final BigInteger field1158; @ObfuscatedName("f") - static final BigInteger field1160; - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "Lkg;" - ) - @Export("NetCache_reference") - static Buffer NetCache_reference; + static final BigInteger field1144; + @ObfuscatedName("i") + static final BigInteger field1142; static { - field1158 = new BigInteger("10001", 16); - field1160 = new BigInteger("94e80a7ee588d1a5fb0774efe8f6014553fea4aa4055827491c7e94dff7547dde03cd70414c02606e8d2ef1bcb94156dfb4f4abd7b407d9a9956eec5d65bf0afa119cbbef760e19e26954f30fc19a91f3cd3cef7e9bf824f15d2b41f2fa4c59059d88212a350ada947c584a6a1b1e01ce33399aeb88dade6d1e4601f5be82cbb", 16); + field1144 = new BigInteger("10001", 16); + field1142 = new BigInteger("a829ab7e2d47507cfcd882652a97602a8c7e3cd5afbd5cfcc669d81bd92ae7972a5c5d9755da447ca19827e60e79d3f609c67492a4082b20cfd50a33b5fe88a33e336e600c1ff6c84652ccfbf0d5e72de43e0bf9feed0a9829c4c475ae559b5ba4cec4bb0ecf84b403d82521b2678c77dc90101b737cb47ce3caa6d55073078d", 16); } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Lhf;Lhf;Lhf;I)V", - garbageValue = "568934897" + signature = "(ILjava/lang/String;Ljava/lang/String;I)V", + garbageValue = "-1594783398" ) - public static void method2090(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) { - SequenceDefinition.SequenceDefinition_archive = var0; - SequenceDefinition.SequenceDefinition_animationsArchive = var1; - SequenceDefinition.SequenceDefinition_skeletonsArchive = var2; + @Export("addGameMessage") + static void addGameMessage(int var0, String var1, String var2) { + GameShell.addChatMessage(var0, var1, var2, (String)null); } - @ObfuscatedName("am") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(ILci;ZI)I", - garbageValue = "480831567" + signature = "(Llc;IIS)I", + garbageValue = "-31800" ) - static int method2091(int var0, Script var1, boolean var2) { - int var3; - int var4; - int var6; - if (var0 == ScriptOpcodes.ENUM_STRING) { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - EnumDefinition var5 = Language.getEnum(var3); - if (var5.outputType != 's') { - } - - for (var6 = 0; var6 < var5.outputCount; ++var6) { - if (var4 == var5.keys[var6]) { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var5.strVals[var6]; - var5 = null; - break; - } - } - - if (var5 != null) { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var5.defaultStr; - } - - return 1; - } else if (var0 != ScriptOpcodes.ENUM) { - if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { - var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - EnumDefinition var10 = Language.getEnum(var3); - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var10.size(); - return 1; - } else { - return 2; - } + static int method2071(IterableNodeHashTable var0, int var1, int var2) { + if (var0 == null) { + return var2; } else { - GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]; - int var9 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 2]; - var6 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 3]; - EnumDefinition var7 = Language.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[++class43.Interpreter_stringStackSize - 1] = var7.strVals[var8]; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var7.intVals[var8]; - } - - var7 = null; - break; - } - } - - if (var7 != null) { - if (var4 == 115) { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var7.defaultStr; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var7.defaultInt; - } - } - - return 1; - } else { - if (var4 == 115) { - Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = "null"; - } else { - Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } + IntegerNode var3 = (IntegerNode)var0.get((long)var1); + return var3 == null ? var2 : var3.integer; } } + + @ObfuscatedName("he") + @ObfuscatedSignature( + signature = "(B)Z", + garbageValue = "114" + ) + static boolean method2072() { + return (Client.drawPlayerNames & 4) != 0; + } } diff --git a/runescape-client/src/main/java/class96.java b/runescape-client/src/main/java/class96.java deleted file mode 100644 index b5dc9293de..0000000000 --- a/runescape-client/src/main/java/class96.java +++ /dev/null @@ -1,113 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("cp") -public class class96 { - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Ljm;" - ) - @Export("reflectionChecks") - static IterableNodeDeque reflectionChecks; - - static { - reflectionChecks = new IterableNodeDeque(); - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(II)Lid;", - garbageValue = "-208126476" - ) - @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("b") - @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "-1542678274" - ) - static int method2314(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("x") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "72" - ) - static final void method2307() { - if (!ViewportMouse.ViewportMouse_false0) { - int var0 = Scene.Scene_cameraPitchSine; - int var1 = Scene.Scene_cameraPitchCosine; - int var2 = Scene.Scene_cameraYawSine; - int var3 = Scene.Scene_cameraYawCosine; - byte var4 = 50; - short var5 = 3500; - int var6 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var4 / Rasterizer3D.Rasterizer3D_zoom; - int var7 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var4 / Rasterizer3D.Rasterizer3D_zoom; - int var8 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var5 / Rasterizer3D.Rasterizer3D_zoom; - int var9 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var5 / Rasterizer3D.Rasterizer3D_zoom; - int var10 = Rasterizer3D.method3048(var7, var4, var1, var0); - int var11 = Rasterizer3D.method3044(var7, var4, var1, var0); - var7 = var10; - var10 = Rasterizer3D.method3048(var9, var5, var1, var0); - int var12 = Rasterizer3D.method3044(var9, var5, var1, var0); - var9 = var10; - var10 = Rasterizer3D.method3054(var6, var11, var3, var2); - var11 = Rasterizer3D.method3067(var6, var11, var3, var2); - var6 = var10; - var10 = Rasterizer3D.method3054(var8, var12, var3, var2); - var12 = Rasterizer3D.method3067(var8, var12, var3, var2); - class30.field261 = (var6 + var10) / 2; - class2.field5 = (var7 + var9) / 2; - GrandExchangeEvents.field36 = (var12 + var11) / 2; - ViewportMouse.field1737 = (var10 - var6) / 2; - ViewportMouse.field1739 = (var9 - var7) / 2; - class288.field3652 = (var12 - var11) / 2; - Frames.field1880 = Math.abs(ViewportMouse.field1737); - class189.field2355 = Math.abs(ViewportMouse.field1739); - class65.field603 = Math.abs(class288.field3652); - } - } - - @ObfuscatedName("ir") - @ObfuscatedSignature( - signature = "(IB)Z", - garbageValue = "-50" - ) - static boolean method2315(int var0) { - return var0 == 57 || var0 == 58 || var0 == 1007 || var0 == 25 || var0 == 30; - } -} diff --git a/runescape-client/src/main/java/class99.java b/runescape-client/src/main/java/class99.java deleted file mode 100644 index d2ea067a6c..0000000000 --- a/runescape-client/src/main/java/class99.java +++ /dev/null @@ -1,14 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("cf") -public interface class99 { - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(I)Lde;", - garbageValue = "2104968763" - ) - @Export("player") - PcmPlayer player(); -}